d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 8.7.3->8.7.4 changes onto mainline.

Browse Source
This commit is contained in:
Peter Wemm 1996-02-22 18:57:52 +00:00
parent 916c098c5f
commit 32e3ec14af
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/sendmail/src/headers.c
View File

@ -33,7 +33,7 @@
*/
#ifndef lint
static char sccsid[] = "@(#)headers.c 8.82 (Berkeley) 10/28/95";
static char sccsid[] = "@(#)headers.c 8.82.1.1 (Berkeley) 2/18/96";
#endif /* not lint */
# include <errno.h>
@ -1253,6 +1253,8 @@ putheader(mci, h, e)
putline(obuf, mci);
p = ++nlp;
obp = obuf;
if (*p != ' ' && *p != '\t')
*obp++ = ' ';
}
sprintf(obp, "%.*s", sizeof obuf - (obp - obuf) - 1, p);
putline(obuf, mci);
@ -1437,7 +1439,7 @@ commaize(h, p, oldstyle, mci, e)
firstone = FALSE;
*p = savechar;
}
(void) strcpy(obp, "\n");
*obp = '\0';
putline(obuf, mci);
}
/*

13
usr.sbin/sendmail/src/util.c
View File

@ -33,7 +33,7 @@
*/
#ifndef lint
static char sccsid[] = "@(#)util.c 8.84 (Berkeley) 11/18/95";
static char sccsid[] = "@(#)util.c 8.84.1.1 (Berkeley) 2/18/96";
#endif /* not lint */
# include "sendmail.h"
@ -989,7 +989,14 @@ putxline(l, mci, pxflags)
(void) putc(*l, mci->mci_out);
fputs(mci->mci_mailer->m_eol, mci->mci_out);
if (*l == '\n')
++l;
{
if (*++l != ' ' && *l != '\t' && l[1] != '\0')
{
(void) putc(' ', mci->mci_out);
if (TrafficLogFile != NULL)
(void) putc(' ', TrafficLogFile);
}
}
} while (l[0] != '\0');
}
/*
@ -1993,7 +2000,6 @@ denlstring(s, strict, logattacks)
for (p = bp; (p = strchr(p, '\n')) != NULL; )
*p++ = ' ';
/*
#ifdef LOG
if (logattacks)
{
@ -2002,7 +2008,6 @@ denlstring(s, strict, logattacks)
shortenstring(bp, 203));
}
#endif
*/
return bp;
}