#if HAVE_AFINET6 -> #ifdef HAVE_AFINET6

[oweals/busybox.git] / networking / route.c

diff --git a/networking/route.c b/networking/route.c
index 5fd888617cc022c6ab1193a9a063cdf04ff15b9a..f343d064c81e5ddb157baffaec5885270b9622b0 100644 (file)
--- a/networking/route.c
+++ b/networking/route.c
@@ -178,7 +178,7 @@ static void INET_setroute(int action, char **args)
                if(prefix) {
                        int prefix_len;
 
-                       prefix_len = bb_xgetularg10_bnd(prefix+1, 0, 32);
+                       prefix_len = xatoul_range(prefix+1, 0, 32);
                        mask_in_addr(rt) = htonl( ~ (0xffffffffUL >> prefix_len));
                        *prefix = '\0';
 #if HAVE_NEW_ADDRT
@@ -186,7 +186,7 @@ static void INET_setroute(int action, char **args)
 #endif
                } else {
                        /* Default netmask. */
-                       netmask = bb_INET_default;
+                       netmask = bb_str_default;
                }
                /* Prefer hostname lookup is -host flag (xflag==1) was given. */
                isnet = INET_resolve(target, (struct sockaddr_in *) &rt.rt_dst,
@@ -218,7 +218,7 @@ static void INET_setroute(int action, char **args)
 
 #if HAVE_NEW_ADDRT
                if (k == KW_IPVx_METRIC) {
-                       rt.rt_metric = bb_xgetularg10(args_m1) + 1;
+                       rt.rt_metric = xatoul(args_m1) + 1;
                        continue;
                }
 #endif
@@ -259,20 +259,20 @@ static void INET_setroute(int action, char **args)
 
                if (k == KW_IPVx_MSS) { /* Check valid MSS bounds. */
                        rt.rt_flags |= RTF_MSS;
-                       rt.rt_mss = bb_xgetularg10_bnd(args_m1, 64, 32768);
+                       rt.rt_mss = xatoul_range(args_m1, 64, 32768);
                        continue;
                }
 
                if (k == KW_IPVx_WINDOW) {      /* Check valid window bounds. */
                        rt.rt_flags |= RTF_WINDOW;
-                       rt.rt_window = bb_xgetularg10_bnd(args_m1, 128, INT_MAX);
+                       rt.rt_window = xatoul_range(args_m1, 128, INT_MAX);
                        continue;
                }
 
 #ifdef RTF_IRTT
                if (k == KW_IPVx_IRTT) {
                        rt.rt_flags |= RTF_IRTT;
-                       rt.rt_irtt = bb_xgetularg10(args_m1);
+                       rt.rt_irtt = xatoul(args_m1);
                        rt.rt_irtt *= (sysconf(_SC_CLK_TCK) / 100);     /* FIXME */
 #if 0                                  /* FIXME: do we need to check anything of this? */
                        if (rt.rt_irtt < 1 || rt.rt_irtt > (120 * HZ)) {
@@ -346,14 +346,14 @@ static void INET6_setroute(int action, char **args)
                /* We know args isn't NULL from the check in route_main. */
                const char *target = *args++;
 
-               if (strcmp(target, bb_INET_default) == 0) {
+               if (strcmp(target, bb_str_default) == 0) {
                        prefix_len = 0;
                        memset(&sa6, 0, sizeof(sa6));
                } else {
                        char *cp;
                        if ((cp = strchr(target, '/'))) { /* Yes... const to non is ok. */
                                *cp = 0;
-                               prefix_len = bb_xgetularg10_bnd(cp+1, 0, 128);
+                               prefix_len = xatoul_range(cp+1, 0, 128);
                        } else {
                                prefix_len = 128;
                        }
@@ -384,7 +384,7 @@ static void INET6_setroute(int action, char **args)
                }
 
                if (k == KW_IPVx_METRIC) {
-                       rt.rtmsg_metric = bb_xgetularg10(args_m1);
+                       rt.rtmsg_metric = xatoul(args_m1);
                        continue;
                }
 
@@ -491,7 +491,7 @@ void displayroutes(int noresolve, int netstatfmt)
 
        FILE *fp = xfopen("/proc/net/route", "r");
 
-       bb_printf("Kernel IP routing table\n"
+       printf("Kernel IP routing table\n"
                          "Destination     Gateway         Genmask"
                          "         Flags %s Iface\n",
                          netstatfmt ? "  MSS Window  irtt" : "Metric Ref    Use");
@@ -534,11 +534,11 @@ void displayroutes(int noresolve, int netstatfmt)
                                          (noresolve | 0x4000), m);     /* Host instead of net. */
 
                mask.s_addr = m;
-               bb_printf("%-16s%-16s%-16s%-6s", sdest, sgw, inet_ntoa(mask), flags);
+               printf("%-16s%-16s%-16s%-6s", sdest, sgw, inet_ntoa(mask), flags);
                if (netstatfmt) {
-                       bb_printf("%5d %-5d %6d %s\n", mtu, win, ir, devname);
+                       printf("%5d %-5d %6d %s\n", mtu, win, ir, devname);
                } else {
-                       bb_printf("%-6d %-2d %7d %s\n", metric, ref, use, devname);
+                       printf("%-6d %-2d %7d %s\n", metric, ref, use, devname);
                }
        }
 }
@@ -561,7 +561,7 @@ static void INET6_displayroutes(int noresolve)
 
        FILE *fp = xfopen("/proc/net/ipv6_route", "r");
 
-       bb_printf("Kernel IPv6 routing table\n%-44s%-40s"
+       printf("Kernel IPv6 routing table\n%-44s%-40s"
                          "Flags Metric Ref    Use Iface\n",
                          "Destination", "Next Hop");
 
@@ -622,7 +622,7 @@ static void INET6_displayroutes(int noresolve)
                                r += 40;
                        } else {                        /* 2nd pass */
                                /* Print the info. */
-                               bb_printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
+                               printf("%-43s %-39s %-5s %-6d %-2d %7d %-8s\n",
                                                  addr6, naddr6, flags, metric, refcnt, use, iface);
                                break;
                        }
@@ -647,22 +647,20 @@ static const char tbl_verb[] =    /* 2nd byte matches RTACTION_* code */
 
 int route_main(int argc, char **argv)
 {
-       unsigned long opt;
+       unsigned opt;
        int what;
        char *family;
+       char **p;
 
        /* First, remap '-net' and '-host' to avoid getopt problems. */
-       {
-               char **p = argv;
-
-               while (*++p) {
-                       if ((strcmp(*p, "-net") == 0) || (strcmp(*p, "-host") == 0)) {
-                               p[0][0] = '#';
-                       }
+       p = argv;
+       while (*++p) {
+               if ((strcmp(*p, "-net") == 0) || (strcmp(*p, "-host") == 0)) {
+                       p[0][0] = '#';
                }
        }
 
-       opt = bb_getopt_ulflags(argc, argv, "A:ne", &family);
+       opt = getopt32(argc, argv, "A:ne", &family);
 
        if ((opt & ROUTE_OPT_A) && strcmp(family, "inet")) {
 #ifdef CONFIG_FEATURE_IPV6
@@ -685,8 +683,7 @@ int route_main(int argc, char **argv)
 #endif
                        displayroutes(noresolve, opt & ROUTE_OPT_e);
 
-               xferror_stdout();
-               bb_fflush_stdout_and_exit(EXIT_SUCCESS);
+               fflush_stdout_and_exit(EXIT_SUCCESS);
        }
 
        /* Check verb.  At the moment, must be add, del, or delete. */