]>
Commit | Line | Data |
---|---|---|
f2f8d1dd SS |
1 | --- procmail-3.22/src/formisc.h.orig 2010-01-10 22:53:39.726707771 +0100 |
2 | +++ procmail-3.22/src/formisc.h 2010-01-10 22:54:57.934199882 +0100 | |
3 | @@ -17,4 +17,4 @@ void | |
4 | char* | |
5 | skipwords P((char*start)); | |
6 | int | |
7 | - getline P((void)); | |
8 | + pm_getline P((void)); | |
9 | --- procmail-3.22/src/fields.c.orig 2010-01-10 22:55:07.463366037 +0100 | |
10 | +++ procmail-3.22/src/fields.c 2010-01-10 22:55:28.953363478 +0100 | |
11 | @@ -110,16 +110,16 @@ void dispfield(p)register const struct f | |
12 | /* try and append one valid field to rdheader from stdin */ | |
13 | int readhead P((void)) | |
14 | { int idlen; | |
15 | - getline(); | |
16 | + pm_getline(); | |
17 | if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */ | |
18 | return 0; | |
19 | if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */ | |
20 | { if(rdheader) | |
21 | return 0; /* the From_ line was a fake! */ | |
22 | - for(;buflast=='>';getline()); /* gather continued >From_ lines */ | |
23 | + for(;buflast=='>';pm_getline()); /* gather continued >From_ lines */ | |
24 | } | |
25 | else | |
26 | - for(;;getline()) /* get the rest of the continued field */ | |
27 | + for(;;pm_getline()) /* get the rest of the continued field */ | |
28 | { switch(buflast) /* will this line be continued? */ | |
29 | { case ' ':case '\t': /* yep, it sure is */ | |
30 | continue; | |
31 | --- procmail-3.22/src/formisc.c.orig 2010-01-10 22:55:37.473363034 +0100 | |
32 | +++ procmail-3.22/src/formisc.c 2010-01-10 22:55:45.763361970 +0100 | |
33 | @@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a | |
34 | buf[buffilled++]=c; | |
35 | } | |
36 | ||
37 | -int getline P((void)) /* read a newline-terminated line */ | |
38 | +int pm_getline P((void)) /* read a newline-terminated line */ | |
39 | { if(buflast==EOF) /* at the end of our Latin already? */ | |
40 | { loadchar('\n'); /* fake empty line */ | |
41 | return EOF; /* spread the word */ |