diff options
| -rw-r--r-- | usr.sbin/route6d/route6d.c | 10 | ||||
| -rw-r--r-- | usr.sbin/rtadvd/config.c | 4 | ||||
| -rw-r--r-- | usr.sbin/traceroute6/traceroute6.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/usr.sbin/route6d/route6d.c b/usr.sbin/route6d/route6d.c index fc32b198f1a..112d07c2712 100644 --- a/usr.sbin/route6d/route6d.c +++ b/usr.sbin/route6d/route6d.c @@ -1,4 +1,4 @@ -/* $OpenBSD: route6d.c,v 1.29 2002/06/07 16:42:07 itojun Exp $ */ +/* $OpenBSD: route6d.c,v 1.30 2002/06/09 02:15:54 deraadt Exp $ */ /* $KAME: route6d.c,v 1.85 2002/06/07 16:39:41 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #if 0 -static char _rcsid[] = "$OpenBSD: route6d.c,v 1.29 2002/06/07 16:42:07 itojun Exp $"; +static char _rcsid[] = "$OpenBSD: route6d.c,v 1.30 2002/06/09 02:15:54 deraadt Exp $"; #endif #include <stdio.h> @@ -3016,11 +3016,11 @@ filterconfig() iflp = ap; goto ifonly; } - if ((p = index(ap, ',')) != NULL) { + if ((p = strchr(ap, ',')) != NULL) { *p++ = '\0'; iflp = p; } - if ((p = index(ap, '/')) == NULL) { + if ((p = strchr(ap, '/')) == NULL) { fatal("no prefixlen specified for '%s'", ap); /*NOTREACHED*/ } @@ -3041,7 +3041,7 @@ ifonly: /* parse the interface listing portion */ while (iflp) { ifname = iflp; - if ((iflp = index(iflp, ',')) != NULL) + if ((iflp = strchr(iflp, ',')) != NULL) *iflp++ = '\0'; ifcp = ifc_find(ifname); if (ifcp == NULL) { diff --git a/usr.sbin/rtadvd/config.c b/usr.sbin/rtadvd/config.c index 775d176e814..b487bfe0e6a 100644 --- a/usr.sbin/rtadvd/config.c +++ b/usr.sbin/rtadvd/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.16 2002/06/08 18:11:13 itojun Exp $ */ +/* $OpenBSD: config.c,v 1.17 2002/06/09 02:15:54 deraadt Exp $ */ /* $KAME: config.c,v 1.62 2002/05/29 10:13:10 itojun Exp $ */ /* @@ -507,7 +507,7 @@ makeentry(buf, len, id, string, add) if (add) { char *cp; - cp = (char *)index(buf, '\0'); + cp = (char *)strchr(buf, '\0'); snprintf(cp, ep - cp, "%d", id); } } diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 1c74d9d9f8f..6c7caa02fb3 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: traceroute6.c,v 1.22 2002/06/02 06:42:29 deraadt Exp $ */ +/* $OpenBSD: traceroute6.c,v 1.23 2002/06/09 02:15:54 deraadt Exp $ */ /* $KAME: traceroute6.c,v 1.50 2002/05/26 13:12:07 itojun Exp $ */ /* @@ -1291,7 +1291,7 @@ inetname(sa) if (first && !nflag) { first = 0; if (gethostname(domain, sizeof(domain)) == 0 && - (cp = index(domain, '.'))) + (cp = strchr(domain, '.'))) (void) strlcpy(domain, cp + 1, sizeof(domain)); else domain[0] = 0; @@ -1300,7 +1300,7 @@ inetname(sa) if (!nflag) { if (getnameinfo(sa, sa->sa_len, line, sizeof(line), NULL, 0, NI_NAMEREQD) == 0) { - if ((cp = index(line, '.')) && + if ((cp = strchr(line, '.')) && !strcmp(cp + 1, domain)) *cp = 0; cp = line; |