diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2007-02-23 15:55:18 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2007-02-23 15:55:18 +0000 |
| commit | 8419fec7a6376dcb97e27edde7c462bce09c2aff (patch) | |
| tree | de95a37179e87ac8c5474fbddf4b987d241202d8 /usr.bin | |
| parent | bcab2f1702cc36d9f632f6eceaa528b442f5bb4e (diff) | |
Ignore trailing space after "Auto-Submitted: no"
Remove an unneeded check for !*p
OK deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/vacation/vacation.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c index 3a79857e2e7..a54272f01f4 100644 --- a/usr.bin/vacation/vacation.c +++ b/usr.bin/vacation/vacation.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vacation.c,v 1.26 2007/02/23 15:26:52 deraadt Exp $ */ +/* $OpenBSD: vacation.c,v 1.27 2007/02/23 15:55:17 millert Exp $ */ /* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */ /* @@ -40,7 +40,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)vacation.c 8.2 (Berkeley) 1/26/94"; #endif -static char rcsid[] = "$OpenBSD: vacation.c,v 1.26 2007/02/23 15:26:52 deraadt Exp $"; +static char rcsid[] = "$OpenBSD: vacation.c,v 1.27 2007/02/23 15:55:17 millert Exp $"; #endif /* not lint */ /* @@ -219,11 +219,14 @@ readheaders(void) * to any message which contains an Auto-Submitted * header where the field has any value other than "no". */ - if (!*p) - exit(0); - if (strlen(p) != 3 || strncasecmp(p, "no", 2)) - exit(0); - break; + if ((p[0] == 'n' || p[0] == 'N') && + (p[1] == 'o' || p[1] == 'O')) { + for (p += 2; *p && isspace(*p); ++p) + ; + if (*p == '\0') + break; /* Auto-Submitted: no */ + } + exit(0); case 'F': /* "From " */ case 'f': cont = 0; @@ -264,8 +267,6 @@ readheaders(void) break; for (p = buf + 11; *p && isspace(*p); ++p) ; - if (!*p) - break; if (!strncasecmp(p, "junk", 4) || !strncasecmp(p, "bulk", 4) || !strncasecmp(p, "list", 4)) |