mirror of
https://git.freebsd.org/ports.git
synced 2025-06-05 21:00:30 -04:00
3038d6005b
mail/procmail-bgrb is a new port tracking the BuGlessRB fork of procmail (which hasn't been updated for over 20 years). The commits to BuGlessRB/procmail appear be by the original author of procmail. Wikipedia documents that the upstream for this port is its repo. As this upstream is in active development and the original procmail on sourceforge is defunct, we may wish to consider merging or replacing mail/procmail with this port at some point. Reported by: Lucas Holt at midnightbsd.org (on Twitter)
56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
diff -up procmail-3.22/src/fields.c.getline procmail-3.22/src/fields.c
|
|
--- procmail-3.22/src/fields.c.getline 2001-09-11 06:57:08.000000000 +0200
|
|
+++ procmail-3.22/src/fields.c 2009-06-30 16:10:36.000000000 +0200
|
|
@@ -110,16 +110,16 @@ void dispfield(p)register const struct f
|
|
/* 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 -up procmail-3.22/src/formail.c.getline procmail-3.22/src/formail.c
|
|
--- procmail-3.22/src/formail.c.getline 2009-06-30 16:00:40.000000000 +0200
|
|
+++ procmail-3.22/src/formail.c 2009-06-30 16:10:49.000000000 +0200
|
|
@@ -819,7 +819,7 @@ splitit: { if(!lnl) /* did the p
|
|
{ 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 -up procmail-3.22/src/formisc.c.getline procmail-3.22/src/formisc.c
|
|
--- procmail-3.22/src/formisc.c.getline 2001-06-29 04:20:45.000000000 +0200
|
|
+++ procmail-3.22/src/formisc.c 2009-06-30 16:12:20.000000000 +0200
|
|
@@ -115,7 +115,7 @@ void loadchar(c)const int c; /* a
|
|
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 -up procmail-3.22/src/formisc.h.getline procmail-3.22/src/formisc.h
|
|
--- procmail-3.22/src/formisc.h.getline 1999-04-19 08:42:15.000000000 +0200
|
|
+++ procmail-3.22/src/formisc.h 2009-06-30 16:10:02.000000000 +0200
|
|
@@ -17,4 +17,4 @@ void
|
|
char*
|
|
skipwords P((char*start));
|
|
int
|
|
- getline P((void));
|
|
+ get_line P((void));
|