|
46
|
1 |
*** procmail-3.22/src/formisc.h.orig Thu Sep 2 11:23:03 2010
|
|
|
2 |
--- procmail-3.22/src/formisc.h Thu Sep 2 11:23:12 2010
|
|
|
3 |
***************
|
|
|
4 |
*** 17,20 ****
|
|
|
5 |
char*
|
|
|
6 |
skipwords P((char*start));
|
|
|
7 |
int
|
|
|
8 |
! getline P((void));
|
|
|
9 |
--- 17,20 ----
|
|
|
10 |
char*
|
|
|
11 |
skipwords P((char*start));
|
|
|
12 |
int
|
|
|
13 |
! my_getline P((void));
|
|
|
14 |
*** procmail-3.22/src/fields.c.orig Thu Sep 2 11:23:21 2010
|
|
|
15 |
--- procmail-3.22/src/fields.c Thu Sep 2 11:23:33 2010
|
|
|
16 |
***************
|
|
|
17 |
*** 110,125 ****
|
|
|
18 |
/* try and append one valid field to rdheader from stdin */
|
|
|
19 |
int readhead P((void))
|
|
|
20 |
{ int idlen;
|
|
|
21 |
! getline();
|
|
|
22 |
if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
|
|
|
23 |
return 0;
|
|
|
24 |
if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
|
|
|
25 |
{ if(rdheader)
|
|
|
26 |
return 0; /* the From_ line was a fake! */
|
|
|
27 |
! for(;buflast=='>';getline()); /* gather continued >From_ lines */
|
|
|
28 |
}
|
|
|
29 |
else
|
|
|
30 |
! for(;;getline()) /* get the rest of the continued field */
|
|
|
31 |
{ switch(buflast) /* will this line be continued? */
|
|
|
32 |
{ case ' ':case '\t': /* yep, it sure is */
|
|
|
33 |
continue;
|
|
|
34 |
--- 110,125 ----
|
|
|
35 |
/* try and append one valid field to rdheader from stdin */
|
|
|
36 |
int readhead P((void))
|
|
|
37 |
{ int idlen;
|
|
|
38 |
! my_getline();
|
|
|
39 |
if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
|
|
|
40 |
return 0;
|
|
|
41 |
if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
|
|
|
42 |
{ if(rdheader)
|
|
|
43 |
return 0; /* the From_ line was a fake! */
|
|
|
44 |
! for(;buflast=='>';my_getline()); /* gather continued >From_ lines */
|
|
|
45 |
}
|
|
|
46 |
else
|
|
|
47 |
! for(;;my_getline()) /* get the rest of the continued field */
|
|
|
48 |
{ switch(buflast) /* will this line be continued? */
|
|
|
49 |
{ case ' ':case '\t': /* yep, it sure is */
|
|
|
50 |
continue;
|
|
|
51 |
*** procmail-3.22/src/formail.c.orig Thu Sep 2 11:23:43 2010
|
|
|
52 |
--- procmail-3.22/src/formail.c Thu Sep 2 11:23:49 2010
|
|
|
53 |
***************
|
|
|
54 |
*** 819,825 ****
|
|
|
55 |
{ if(split) /* gobble up the next start separator */
|
|
|
56 |
{ buffilled=0;
|
|
|
57 |
#ifdef sMAILBOX_SEPARATOR
|
|
|
58 |
! getline();buffilled=0; /* but only if it's defined */
|
|
|
59 |
#endif
|
|
|
60 |
if(buflast!=EOF) /* if any */
|
|
|
61 |
goto splitit;
|
|
|
62 |
--- 819,825 ----
|
|
|
63 |
{ if(split) /* gobble up the next start separator */
|
|
|
64 |
{ buffilled=0;
|
|
|
65 |
#ifdef sMAILBOX_SEPARATOR
|
|
|
66 |
! my_getline();buffilled=0; /* but only if it's defined */
|
|
|
67 |
#endif
|
|
|
68 |
if(buflast!=EOF) /* if any */
|
|
|
69 |
goto splitit;
|
|
|
70 |
*** procmail-3.22/src/formisc.c.orig Thu Sep 2 11:23:58 2010
|
|
|
71 |
--- procmail-3.22/src/formisc.c Thu Sep 2 11:24:05 2010
|
|
|
72 |
***************
|
|
|
73 |
*** 115,121 ****
|
|
|
74 |
buf[buffilled++]=c;
|
|
|
75 |
}
|
|
|
76 |
|
|
|
77 |
! int getline P((void)) /* read a newline-terminated line */
|
|
|
78 |
{ if(buflast==EOF) /* at the end of our Latin already? */
|
|
|
79 |
{ loadchar('\n'); /* fake empty line */
|
|
|
80 |
return EOF; /* spread the word */
|
|
|
81 |
--- 115,121 ----
|
|
|
82 |
buf[buffilled++]=c;
|
|
|
83 |
}
|
|
|
84 |
|
|
|
85 |
! int my_getline P((void)) /* read a newline-terminated line */
|
|
|
86 |
{ if(buflast==EOF) /* at the end of our Latin already? */
|
|
|
87 |
{ loadchar('\n'); /* fake empty line */
|
|
|
88 |
return EOF; /* spread the word */
|