Sophie

Sophie

distrib > Mandriva > 10.2 > x86_64 > by-pkgid > 932576772f7218abbdd2d0147a7efac4 > files > 4

leafnode-1.10.4-1.1.102mdk.src.rpm

diff -Nur leafnode-1.11.2.rel/artutil.c leafnode-1.11.3.rel/artutil.c
--- leafnode-1.11.2.rel/artutil.c	2004-03-16 03:54:43.000000000 +0100
+++ leafnode-1.11.3.rel/artutil.c	2005-06-08 15:53:24.000000000 +0200
@@ -37,7 +37,7 @@
     rewind(f);
     debug = 0;
     hdr = NULL;
-    while ((p = getfoldedline(f)) && *p) {
+    while ((p = getfoldedline(f, getaline)) && *p) {
 	/* read only headers */
 	char *q = p;
 	if ((strncasecmp(q, header, hlen) == 0)) {
diff -Nur leafnode-1.11.2.rel/fetchnews.c leafnode-1.11.3.rel/fetchnews.c
--- leafnode-1.11.2.rel/fetchnews.c	2005-05-04 12:01:44.000000000 +0200
+++ leafnode-1.11.3.rel/fetchnews.c	2005-06-08 15:53:12.000000000 +0200
@@ -1166,7 +1166,7 @@
 	}
 	c = NULL;
 	n = 9;			/* "other" header */
-	while ((l = getfoldedline(nntpin)) && *l && strcmp(l, ".")) {
+	while ((l = getfoldedline(nntpin, mgetaline)) && *l && strcmp(l, ".")) {
 	    /* regexp pattern matching */
 	    if (filterfile && dofilter(l)) {
 		killed++;
diff -Nur leafnode-1.11.2.rel/getfoldedline.c leafnode-1.11.3.rel/getfoldedline.c
--- leafnode-1.11.2.rel/getfoldedline.c	2003-10-20 00:12:22.000000000 +0200
+++ leafnode-1.11.3.rel/getfoldedline.c	2005-06-08 15:56:13.000000000 +0200
@@ -8,7 +8,7 @@
 #include <string.h>
 
 /*@null@*/ /*@only@*/ char *
-getfoldedline(FILE * f)
+getfoldedline(FILE * f, char *(*reader)(FILE *))
 {
     /* what characters are considered whitespace that marks the beginning of
        continuation lines.
@@ -18,7 +18,7 @@
     int c;
     size_t len, oldlen;
 
-    l1 = getaline(f);
+    l1 = reader(f);
     if (!l1)
 	return NULL;
     l2 = (char *)critmalloc((len = strlen(l1)) + 1, "getfoldedline");
@@ -33,7 +33,7 @@
 		ungetc(c, f);
 		if (strchr(white, c)) {
 		    /* join */
-		    l1 = getaline(f);
+		    l1 = reader(f);
 		    if (l1) {
 			oldlen = len;
 			len += strlen(l1) + 1;
@@ -60,7 +60,7 @@
 main()
 {
     char *f;
-    while ((f = getfoldedline(stdin))) {
+    while ((f = getfoldedline(stdin, getaline))) {
 	puts(f);
 	free(f);
     }
diff -Nur leafnode-1.11.2.rel/leafnode.h leafnode-1.11.3.rel/leafnode.h
--- leafnode-1.11.2.rel/leafnode.h	2005-04-05 17:56:08.000000000 +0200
+++ leafnode-1.11.3.rel/leafnode.h	2005-06-08 16:06:15.000000000 +0200
@@ -353,7 +353,7 @@
 
 /* from getfoldedline.c */
 /*@null@*/ /*@only@*/
-char *getfoldedline(FILE * f);
+char *getfoldedline(FILE * f, char *(*reader)(FILE *));
 /* reads one line, regardless of length, returns malloc()ed string! */
 
 /* from writes.c (ln-2) */