procmail: rename the internal getline function to avoid conflict with eglibc

SVN-Revision: 32539

diff --git a/mail/procmail/patches/100-rename_getline.patch b/mail/procmail/patches/100-rename_getline.patch
new file mode 100644 (file)
index 0000000..6cd359d
--- /dev/null
+++ b/mail/procmail/patches/100-rename_getline.patch
@@ -0,0 +1,52 @@
+--- a/src/fields.c
++++ b/src/fields.c
+@@ -110,16 +110,16 @@
+                   /* try and append one valid field to rdheader from stdin */
+ int readhead P((void))
+ { int idlen;
+-  getline();
++  __getline();
+   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=='>';__getline());      /* gather continued >From_ lines */
+    }
+   else
+-     for(;;getline())               /* get the rest of the continued field */
++     for(;;__getline())                     /* get the rest of the continued field */
+       { switch(buflast)                            /* will this line be continued? */
+        { case ' ':case '\t':                            /* yep, it sure is */
+             continue;
+--- a/src/formail.c
++++ b/src/formail.c
+@@ -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 */
++         __getline();buffilled=0;              /* but only if it's defined */
+ #endif
+          if(buflast!=EOF)                                        /* if any */
+             goto splitit;
+--- a/src/formisc.c
++++ b/src/formisc.c
+@@ -115,7 +115,7 @@
+   buf[buffilled++]=c;
+ }
+ 
+-int getline P((void))                    /* read a newline-terminated line */
++int __getline 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 */
+--- a/src/formisc.h
++++ b/src/formisc.h
+@@ -17,4 +17,4 @@
+ char*
+  skipwords P((char*start));
+ int
+- getline P((void));
++ __getline P((void));