|
 |
0cd361 |
diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
|
|
|
0cd361 |
--- procmail-3.22/src/fields.c.getline 2001-09-11 06:57:08.000000000 +0200
|
|
|
0cd361 |
+++ procmail-3.22/src/fields.c 2009-06-30 16:10:36.000000000 +0200
|
|
|
0cd361 |
@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
|
|
|
0cd361 |
/* try and append one valid field to rdheader from stdin */
|
|
|
0cd361 |
int readhead P((void))
|
|
|
0cd361 |
{ int idlen;
|
|
|
0cd361 |
- getline();
|
|
|
0cd361 |
+ get_line();
|
|
|
0cd361 |
if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
|
|
|
0cd361 |
return 0;
|
|
|
0cd361 |
if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
|
|
|
0cd361 |
{ if(rdheader)
|
|
|
0cd361 |
return 0; /* the From_ line was a fake! */
|
|
|
0cd361 |
- for(;buflast=='>';getline()); /* gather continued >From_ lines */
|
|
|
0cd361 |
+ for(;buflast=='>';get_line()); /* gather continued >From_ lines */
|
|
|
0cd361 |
}
|
|
|
0cd361 |
else
|
|
|
0cd361 |
- for(;;getline()) /* get the rest of the continued field */
|
|
|
0cd361 |
+ for(;;get_line()) /* get the rest of the continued field */
|
|
|
0cd361 |
{ switch(buflast) /* will this line be continued? */
|
|
|
0cd361 |
{ case ' ':case '\t': /* yep, it sure is */
|
|
|
0cd361 |
continue;
|
|
|
0cd361 |
diff -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
|
|
|
0cd361 |
--- procmail-3.22/src/formail.c.getline 2009-06-30 16:00:40.000000000 +0200
|
|
|
0cd361 |
+++ procmail-3.22/src/formail.c 2009-06-30 16:10:49.000000000 +0200
|
|
|
0cd361 |
@@ -819,7 +819,7 @@ splitit: { if(!lnl) /* did the p
|
|
|
0cd361 |
{ if(split) /* gobble up the next start separator */
|
|
|
0cd361 |
{ buffilled=0;
|
|
|
0cd361 |
#ifdef sMAILBOX_SEPARATOR
|
|
|
0cd361 |
- getline();buffilled=0; /* but only if it's defined */
|
|
|
0cd361 |
+ get_line();buffilled=0; /* but only if it's defined */
|
|
|
0cd361 |
#endif
|
|
|
0cd361 |
if(buflast!=EOF) /* if any */
|
|
|
0cd361 |
goto splitit;
|
|
|
0cd361 |
diff -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
|
|
|
0cd361 |
--- procmail-3.22/src/formisc.c.getline 2001-06-29 04:20:45.000000000 +0200
|
|
|
0cd361 |
+++ procmail-3.22/src/formisc.c 2009-06-30 16:12:20.000000000 +0200
|
|
|
0cd361 |
@@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a
|
|
|
0cd361 |
buf[buffilled++]=c;
|
|
|
0cd361 |
}
|
|
|
0cd361 |
|
|
|
0cd361 |
-int getline P((void)) /* read a newline-terminated line */
|
|
|
0cd361 |
+int get_line P((void)) /* read a newline-terminated line */
|
|
|
0cd361 |
{ if(buflast==EOF) /* at the end of our Latin already? */
|
|
|
0cd361 |
{ loadchar('\n'); /* fake empty line */
|
|
|
0cd361 |
return EOF; /* spread the word */
|
|
|
0cd361 |
diff -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
|
|
|
0cd361 |
--- procmail-3.22/src/formisc.h.getline 1999-04-19 08:42:15.000000000 +0200
|
|
|
0cd361 |
+++ procmail-3.22/src/formisc.h 2009-06-30 16:10:02.000000000 +0200
|
|
|
0cd361 |
@@ -17,4 +17,4 @@ void
|
|
|
0cd361 |
char*
|
|
|
0cd361 |
skipwords P((char*start));
|
|
|
0cd361 |
int
|
|
|
0cd361 |
- getline P((void));
|
|
|
0cd361 |
+ get_line P((void));
|