summaryrefslogtreecommitdiffstats
path: root/extra/procmail/procmail-getline.patch
blob: e795dd787e6fd23c56db3c6dd9d96effb8ac0731 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
 diff -Nru procmail-3.22.orig/src/fields.c procmail-3.22/src/fields.c
 --- procmail-3.22.orig/src/fields.c     2009-05-15 21:59:51.768416278 +0200
 +++ procmail-3.22/src/fields.c  2009-05-15 22:00:58.128416259 +0200
 @@ -110,16 +110,16 @@
                     /* try and append one valid field to rdheader from stdin */
  int readhead P((void))
  { int idlen;
 -  getline();
 +  get_line();
    if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
       return 0;
    if(idlen==STRLEN(FROM)&&eqFrom_(buf))                        /* it's a From_ line */
     { if(rdheader)
         return 0;                              /* the From_ line was a fake! */
 -     for(;buflast=='>';getline());         /* gather continued >From_ lines */
 +     for(;buflast=='>';get_line());        /* gather continued >From_ lines */
     }
    else
 -     for(;;getline())                /* get the rest of the continued field */
 +     for(;;get_line())               /* get the rest of the continued field */
        { switch(buflast)                             /* will this line be continued? */
          { case ' ':case '\t':                            /* yep, it sure is */
               continue;
 diff -Nru procmail-3.22.orig/src/formail.c procmail-3.22/src/formail.c
 --- procmail-3.22.orig/src/formail.c    2009-05-15 21:59:51.768416278 +0200
 +++ procmail-3.22/src/formail.c 2009-05-15 22:01:23.778416754 +0200
 @@ -819,7 +819,7 @@
        { if(split)                     /* gobble up the next start separator */
          { buffilled=0;
  #ifdef sMAILBOX_SEPARATOR
 -          getline();buffilled=0;                /* but only if it's defined */
 +          get_line();buffilled=0;               /* but only if it's defined */
  #endif
            if(buflast!=EOF)                                        /* if any */
               goto splitit;
 diff -Nru procmail-3.22.orig/src/formisc.c procmail-3.22/src/formisc.c
 --- procmail-3.22.orig/src/formisc.c    2009-05-15 21:59:51.768416278 +0200
 +++ procmail-3.22/src/formisc.c 2009-05-15 22:02:00.538416155 +0200
 @@ -115,7 +115,7 @@
    buf[buffilled++]=c;
  }
  
 -int getline P((void))                     /* read a newline-terminated line */
 +int get_line P((void))                    /* read a newline-terminated line */
  { if(buflast==EOF)                      /* at the end of our Latin already? */
     { loadchar('\n');                                     /* fake empty line */
       return EOF;                                         /* spread the word */
 diff -Nru procmail-3.22.orig/src/formisc.h procmail-3.22/src/formisc.h
 --- procmail-3.22.orig/src/formisc.h    2009-05-15 21:59:51.768416278 +0200
 +++ procmail-3.22/src/formisc.h 2009-05-15 22:02:12.028416164 +0200
 @@ -17,4 +17,4 @@
  char*
   skipwords P((char*start));
  int
 - getline P((void));
 + get_line P((void));