diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 1997-01-17 07:14:33 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 1997-01-17 07:14:33 +0000 |
| commit | 3e150a880447536a0af58c395e5a857635e985d3 (patch) | |
| tree | 867c3504f60ee9bfd2fa5db3dd66d5b3a1649ecd /usr.bin/vacation | |
| parent | 8e78a24e2e89c03ac53bd758a1781c925fe7ab71 (diff) | |
r?index -> strr?chr
Diffstat (limited to 'usr.bin/vacation')
| -rw-r--r-- | usr.bin/vacation/vacation.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/vacation/vacation.c b/usr.bin/vacation/vacation.c index b04d24a4fe4..e9ccc2a6063 100644 --- a/usr.bin/vacation/vacation.c +++ b/usr.bin/vacation/vacation.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vacation.c,v 1.4 1997/01/15 23:43:31 millert Exp $ */ +/* $OpenBSD: vacation.c,v 1.5 1997/01/17 07:13:48 millert Exp $ */ /* $NetBSD: vacation.c,v 1.7 1995/04/29 05:58:27 cgd Exp $ */ /* @@ -44,7 +44,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.4 1997/01/15 23:43:31 millert Exp $"; +static char rcsid[] = "$OpenBSD: vacation.c,v 1.5 1997/01/17 07:13:48 millert Exp $"; #endif /* not lint */ /* @@ -216,7 +216,7 @@ readheaders() for (p = buf + 5; *p && *p != ' '; ++p); *p = '\0'; (void)strcpy(from, buf + 5); - if (p = index(from, '\n')) + if (p = strchr(from, '\n')) *p = '\0'; if (junkmail()) exit(0); @@ -227,7 +227,7 @@ readheaders() if (strncasecmp(buf, "Precedence", 10) || buf[10] != ':' && buf[10] != ' ' && buf[10] != '\t') break; - if (!(p = index(buf, ':'))) + if (!(p = strchr(buf, ':'))) break; while (*++p && isspace(*p)); if (!*p) @@ -305,9 +305,9 @@ junkmail() * * From site!site!SENDER%site.domain%site.domain@site.domain */ - if (!(p = index(from, '%'))) - if (!(p = index(from, '@'))) { - if (p = rindex(from, '!')) + if (!(p = strchr(from, '%'))) + if (!(p = strchr(from, '@'))) { + if (p = strrchr(from, '!')) ++p; else p = from; |