slackware-current/source/n/newspost/newspost.getline.diff
Patrick J Volkerding 646a5c1cbf Mon May 28 19:12:29 UTC 2018
a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.
2018-05-31 23:39:35 +02:00

57 lines
2 KiB
Diff

diff -u -r newspost-2.1.1.orig/base/newspost.c newspost-2.1.1/base/newspost.c
--- newspost-2.1.1.orig/base/newspost.c 2003-04-23 10:33:23.000000000 -0500
+++ newspost-2.1.1/base/newspost.c 2018-02-02 16:14:51.133929233 -0600
@@ -342,7 +342,7 @@
file = fopen(filename, "r");
if (file != NULL) {
while (!feof(file)) {
- line = getline(line, file);
+ line = newspost_getline(line, file);
if(line == NULL){
text_buffer = buff_add(text_buffer, "\r\n");
continue;
diff -u -r newspost-2.1.1.orig/base/utils.c newspost-2.1.1/base/utils.c
--- newspost-2.1.1.orig/base/utils.c 2003-04-23 10:33:23.000000000 -0500
+++ newspost-2.1.1/base/utils.c 2018-02-02 16:14:36.751929386 -0600
@@ -43,7 +43,7 @@
return NULL;
}
-Buff * getline(Buff *buff, FILE *file){
+Buff * newspost_getline(Buff *buff, FILE *file){
char c = fgetc(file);
buff = buff_free(buff);
while(TRUE){
diff -u -r newspost-2.1.1.orig/base/utils.h newspost-2.1.1/base/utils.h
--- newspost-2.1.1.orig/base/utils.h 2003-02-08 09:09:41.000000000 -0600
+++ newspost-2.1.1/base/utils.h 2018-02-02 16:15:07.069929063 -0600
@@ -26,7 +26,7 @@
file_entry * file_entry_alloc();
file_entry * file_entry_free(file_entry *fe);
-Buff * getline(Buff *buff, FILE *file);
+Buff * newspost_getline(Buff *buff, FILE *file);
Buff *buff_add(Buff *buff, char *data, ... );
Buff * buff_free(Buff *buff);
Buff *buff_create(Buff *buff, char *data, ... );
diff -u -r newspost-2.1.1.orig/ui/options.c newspost-2.1.1/ui/options.c
--- newspost-2.1.1.orig/ui/options.c 2003-04-23 10:33:33.000000000 -0500
+++ newspost-2.1.1/ui/options.c 2018-02-02 16:16:53.144927936 -0600
@@ -332,7 +332,7 @@
file = fopen(filename->data, "r");
if (file != NULL) {
while (!feof(file)) {
- line = getline(line, file);
+ line = newspost_getline(line, file);
linenum++;
if(line == NULL) continue;
@@ -429,7 +429,7 @@
linenum = 0;
while (linenum < 8) {
linenum++;
- line = getline(line, file);
+ line = newspost_getline(line, file);
if(line == NULL) continue;
switch (linenum) {