Attachment #192043 for bug #270551

View | Details | Raw Unified | Return to bug 270551
Collapse All | Expand All




	extractfield(p);
}
		    /* try and append one valid field to rdheader from stdin */
int readhead P((void))
{ int idlen;
  procmail_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=='>';procmail_getline());	    /* gather continued >From_ lines */
   }
  else
     for(;;procmail_getline())		      /* get the rest of the continued field */
      { switch(buflast)			     /* will this line be continued? */
	 { case ' ':case '\t':				  /* yep, it sure is */
	      continue;
	 }
	break;

Lines 817-827 Link Here

(-)procmail-3.22.orig/src/formail.c (-1 / +1 lines)
817	#ifdef MAILBOX_SEPARATOR	817	#ifdef MAILBOX_SEPARATOR
818	if(!strncmp(emboxsep,buf,STRLEN(emboxsep))) /* end of mail? */	818	if(!strncmp(emboxsep,buf,STRLEN(emboxsep))) /* end of mail? */
819	{ if(split) /* gobble up the next start separator */	819	{ if(split) /* gobble up the next start separator */
820	{ buffilled=0;	820	{ buffilled=0;
821	#ifdef sMAILBOX_SEPARATOR	821	#ifdef sMAILBOX_SEPARATOR
822	getline();buffilled=0; /* but only if it's defined */	822	procmail_getline();buffilled=0; /* but only if it's defined */
823	#endif	823	#endif
824	if(buflast!=EOF) /* if any */	824	if(buflast!=EOF) /* if any */
825	goto splitit;	825	goto splitit;
826	break;	826	break;
827	}	827	}

Lines 113-123 Link Here

(-)procmail-3.22.orig/src/formisc.c (-1 / +1 lines)
113	{ if(buffilled==buflen)	113	{ if(buffilled==buflen)
114	buf=realloc(buf,buflen+=Bsize);	114	buf=realloc(buf,buflen+=Bsize);
115	buf[buffilled++]=c;	115	buf[buffilled++]=c;
116	}	116	}
117		117
118	int getline P((void)) /* read a newline-terminated line */	118	int procmail_getline P((void)) /* read a newline-terminated line */
119	{ if(buflast==EOF) /* at the end of our Latin already? */	119	{ if(buflast==EOF) /* at the end of our Latin already? */
120	{ loadchar('\n'); /* fake empty line */	120	{ loadchar('\n'); /* fake empty line */
121	return EOF; /* spread the word */	121	return EOF; /* spread the word */
122	}	122	}
123	loadchar(buflast); /* load leftover into the buffer */	123	loadchar(buflast); /* load leftover into the buffer */

Lines 15-20 Link Here

(-)procmail-3.22.orig/src/formisc.h (-1 / +1 lines)
15	closemine P((void)),	15	closemine P((void)),
16	opensink P((void));	16	opensink P((void));
17	char*	17	char*
18	skipwords P((char*start));	18	skipwords P((char*start));
19	int	19	int
20	getline P((void));	20	procmail_getline P((void));

Return to bug 270551

Lines 108-127 Link Here

(-)procmail-3.22.orig/src/fields.c (-3 / +3 lines)
108	extractfield(p);	108	extractfield(p);
109	}	109	}
110	/* try and append one valid field to rdheader from stdin */	110	/* try and append one valid field to rdheader from stdin */
111	int readhead P((void))	111	int readhead P((void))
112	{ int idlen;	112	{ int idlen;
113	getline();	113	procmail_getline();
114	if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */	114	if((idlen=breakfield(buf,buffilled))<=0) /* not the start of a valid field */
115	return 0;	115	return 0;
116	if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */	116	if(idlen==STRLEN(FROM)&&eqFrom_(buf)) /* it's a From_ line */
117	{ if(rdheader)	117	{ if(rdheader)
118	return 0; /* the From_ line was a fake! */	118	return 0; /* the From_ line was a fake! */
119	for(;buflast=='>';getline()); /* gather continued >From_ lines */	119	for(;buflast=='>';procmail_getline()); /* gather continued >From_ lines */
120	}	120	}
121	else	121	else
122	for(;;getline()) /* get the rest of the continued field */	122	for(;;procmail_getline()) /* get the rest of the continued field */
123	{ switch(buflast) /* will this line be continued? */	123	{ switch(buflast) /* will this line be continued? */
124	{ case ' ':case '\t': /* yep, it sure is */	124	{ case ' ':case '\t': /* yep, it sure is */
125	continue;	125	continue;
126	}	126	}
127	break;	127	break;