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

The return-path is optional in a headline, therefore don't skip a

Browse Source 
message if it is missing the return-path.

PR:		bin/40314 (slightly different patch)
MFC after:	2 weeks
This commit is contained in:
mikeh 2003-01-09 05:08:37 +00:00
parent 4b8af226d2
commit 2e30918ec8
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
usr.bin/mail/head.c
View File

@ -60,11 +60,11 @@ ishead(linebuf)
struct headline hl;
char parbuf[BUFSIZ];
if (strncmp(linebuf, "From ", 5))
if (strncmp(linebuf, "From ", 5) != 0)
return (0);
parse(linebuf, &hl, parbuf);
if (hl.l_from == NULL || hl.l_date == NULL) {
fail(linebuf, "No from or date field");
if (hl.l_date == NULL) {
fail(linebuf, "No date field");
return (0);
}
if (!isdate(hl.l_date)) {
@ -113,10 +113,17 @@ parse(line, hl, pbuf)
* Skip over "From" first.
*/
cp = nextword(cp, word);
/*
* Check for missing return-path.
*/
if (isdate(cp)) {
hl->l_date = copyin(cp, &sp);
return;
}
cp = nextword(cp, word);
if (*word != '\0')
if (strlen(word) > 0)
hl->l_from = copyin(word, &sp);
if (cp != NULL && cp[0] == 't' && cp[1] == 't' && cp[2] == 'y') {
if (cp != NULL && strncmp(cp, "tty", 3) == 0) {
cp = nextword(cp, word);
hl->l_tty = copyin(word, &sp);
}