[src/trunk]: src/sbin/ifconfig metric and mtu are u_long, not int.

[itojun <itojun%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eebeaf8e0ef8
branches:  trunk
changeset: 532739:eebeaf8e0ef8
user:      itojun <itojun%NetBSD.org@localhost>
date:      Fri Jun 14 01:04:41 2002 +0000

description:
metric and mtu are u_long, not int.

diffstat:

 sbin/ifconfig/ifconfig.c |  27 ++++++++++++++++++++-------
 1 files changed, 20 insertions(+), 7 deletions(-)

diffs (93 lines):

diff -r 2e6ec0a52acf -r eebeaf8e0ef8 sbin/ifconfig/ifconfig.c
--- a/sbin/ifconfig/ifconfig.c  Fri Jun 14 00:58:39 2002 +0000
+++ b/sbin/ifconfig/ifconfig.c  Fri Jun 14 01:04:41 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ifconfig.c,v 1.124 2002/05/23 21:38:01 matt Exp $      */
+/*     $NetBSD: ifconfig.c,v 1.125 2002/06/14 01:04:41 itojun Exp $    */
 
 /*-
  * Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -80,7 +80,7 @@
 #if 0
 static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
 #else
-__RCSID("$NetBSD: ifconfig.c,v 1.124 2002/05/23 21:38:01 matt Exp $");
+__RCSID("$NetBSD: ifconfig.c,v 1.125 2002/06/14 01:04:41 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -137,7 +137,8 @@
 struct netrange        at_nr;          /* AppleTalk net range */
 
 char   name[30];
-int    flags, metric, mtu, setaddr, setipdst, doalias;
+int    flags, setaddr, setipdst, doalias;
+u_long metric, mtu;
 int    clearaddr, s;
 int    newaddr = -1;
 int    conflicting = 0;
@@ -1169,6 +1170,7 @@
        const char *vname;
        int value;
 {
+
        if (value < 0) {
                value = -value;
                in6_addreq.ifra_flags &= ~value;
@@ -1181,6 +1183,7 @@
        const char *val;
        int d;
 {
+
        setia6lifetime("pltime", val);
 }
 
@@ -1189,6 +1192,7 @@
        const char *val;
        int d;
 {
+
        setia6lifetime("vltime", val);
 }
 
@@ -1221,8 +1225,13 @@
        const char *val;
        int d;
 {
+       char *ep;
+
        (void) strncpy(ifr.ifr_name, name, sizeof (ifr.ifr_name));
-       ifr.ifr_metric = atoi(val);
+       ep = NULL;
+       ifr.ifr_metric = strtoul(val, &ep, 10);
+       if (!ep || *ep)
+               errx(1, "%s: invalid metric", val);
        if (ioctl(s, SIOCSIFMETRIC, (caddr_t)&ifr) == -1)
                warn("SIOCSIFMETRIC");
 }
@@ -1232,8 +1241,12 @@
        const char *val;
        int d;
 {
+       char *ep;
+
        (void)strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
-       ifr.ifr_mtu = atoi(val);
+       ifr.ifr_mtu = strtoul(val, &ep, 10);
+       if (!ep || *ep)
+               errx(1, "%s: invalid mtu", val);
        if (ioctl(s, SIOCSIFMTU, (caddr_t)&ifr) == -1)
                warn("SIOCSIFMTU");
 }
@@ -1869,9 +1882,9 @@
        printf("%s: ", name);
        printb("flags", flags, IFFBITS);
        if (metric)
-               printf(" metric %d", metric);
+               printf(" metric %lu", metric);
        if (mtu)
-               printf(" mtu %d", mtu);
+               printf(" mtu %lu", mtu);
        putchar('\n');
 
        if (g_ifcr.ifcr_capabilities) {