Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use strtoul, not atoi.

Browse Source 
don't print strerrno() if errno == 0 on fatal().
sync w/kame
This commit is contained in:
itojun 2002-10-26 20:10:02 +00:00
parent 6837231089
commit 41b5d4f9af
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr.sbin/route6d/route6d.c
View File

@ -1,5 +1,5 @@
/* $NetBSD: route6d.c,v 1.43 2002/09/27 14:43:00 itojun Exp $ */ /* $NetBSD: route6d.c,v 1.44 2002/10/26 20:10:02 itojun Exp $ */
/* $KAME: route6d.c,v 1.88 2002/08/21 16:24:25 itojun Exp $ */ /* $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $ */
/* /*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@ -32,7 +32,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__RCSID("$NetBSD: route6d.c,v 1.43 2002/09/27 14:43:00 itojun Exp $"); __RCSID("$NetBSD: route6d.c,v 1.44 2002/10/26 20:10:02 itojun Exp $");
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -2948,13 +2948,14 @@ void
filterconfig(void) filterconfig(void)
{ {
int i; int i;
char *p, *ap, *iflp, *ifname; char *p, *ap, *iflp, *ifname, *ep;
struct iff ftmp, *iff_obj; struct iff ftmp, *iff_obj;
struct ifc *ifcp; struct ifc *ifcp;
struct riprt *rrt; struct riprt *rrt;
#if 0 #if 0
struct in6_addr gw; struct in6_addr gw;
#endif #endif
u_long plen;
for (i = 0; i < nfilter; i++) { for (i = 0; i < nfilter; i++) {
ap = filter[i]; ap = filter[i];
@ -2977,7 +2978,14 @@ filterconfig(void)
fatal("invalid prefix specified for '%s'", ap); fatal("invalid prefix specified for '%s'", ap);
/*NOTREACHED*/ /*NOTREACHED*/
} }
ftmp.iff_plen = atoi(p); errno = 0;
ep = NULL;
plen = strtoul(p, &ep, 10);
if (errno || !*p || *ep || plen > sizeof(ftmp.iff_addr) * 8) {
fatal("invalid prefix length specified for '%s'", ap);
/*NOTREACHED*/
}
ftmp.iff_plen = plen;
ftmp.iff_next = NULL; ftmp.iff_next = NULL;
applyplen(&ftmp.iff_addr, ftmp.iff_plen); applyplen(&ftmp.iff_addr, ftmp.iff_plen);
ifonly: ifonly:
@ -3261,7 +3269,10 @@ fatal(const char *fmt, ...)
vsnprintf(buf, sizeof(buf), fmt, ap); vsnprintf(buf, sizeof(buf), fmt, ap);
va_end(ap); va_end(ap);
perror(buf); perror(buf);
if (errno)
syslog(LOG_ERR, "%s: %s", buf, strerror(errno)); syslog(LOG_ERR, "%s: %s", buf, strerror(errno));
else
syslog(LOG_ERR, "%s", buf);
rtdexit(); rtdexit();
} }