- use RESERVE_CONFIG_BUFFER. For defconfig this gives:

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

diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index d75c883b8e62bd446da1ee2bd06b2ce8211c8f83..c5f2ba121ec4520b5f90d380c30dfc5cc2d4c9cc 100644 (file)
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -5,8 +5,8 @@
  * By Jordan Crouse <jordan@cosmicpenguin.net>
  *    Stephan Linz  <linz@li-pro.net>
  *
- * This is a complete reimplentation of the ipcalc program
- * from Redhat.  I didn't look at their source code, but there
+ * This is a complete reimplementation of the ipcalc program
+ * from Red Hat.  I didn't look at their source code, but there
  * is no denying that this is a loving reimplementation
  */
 
@@ -44,15 +44,15 @@ static unsigned long get_netmask(unsigned long ipaddr)
 static int get_prefix(unsigned long netmask)
 {
        unsigned long msk = 0x80000000;
-        int ret = 0;
+       int ret = 0;
 
        netmask = htonl(netmask);
        while(msk) {
                if (netmask & msk)
                        ret++;
                msk >>= 1;
-        }
-        return ret;
+       }
+       return ret;
 }
 #endif
 
@@ -68,10 +68,10 @@ int ipcalc_main(int argc, char **argv)
 {
        unsigned long mode;
 
-       unsigned long netmask;
-       unsigned long broadcast;
-       unsigned long network;
-       unsigned long ipaddr;
+       in_addr_t netmask;
+       in_addr_t broadcast;
+       in_addr_t network;
+       in_addr_t ipaddr;
        struct in_addr a;
 
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
@@ -81,13 +81,13 @@ int ipcalc_main(int argc, char **argv)
 #endif
 
        static const struct option long_options[] = {
-               {"netmask", no_argument, NULL, 'm'},
-               {"broadcast", no_argument, NULL, 'b'},
-               {"network", no_argument, NULL, 'n'},
+               {"netmask",             no_argument, NULL, 'm'},
+               {"broadcast",   no_argument, NULL, 'b'},
+               {"network",             no_argument, NULL, 'n'},
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
-                {"prefix", no_argument, NULL, 'p'},
-               {"hostname", no_argument, NULL, 'h'},
-               {"silent", no_argument, NULL, 's'},
+               {"prefix",              no_argument, NULL, 'p'},
+               {"hostname",    no_argument, NULL, 'h'},
+               {"silent",              no_argument, NULL, 's'},
 #endif
                {NULL, 0, NULL, 0}
        };
@@ -95,82 +95,84 @@ int ipcalc_main(int argc, char **argv)
        bb_applet_long_options = long_options;
        mode = bb_getopt_ulflags(argc, argv,
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
-                                                         "mbnphs");
+                       "mbnphs"
 #else
-                                                         "mbn");
+                       "mbn"
 #endif
+                       );
+
+       argc -= optind;
+       argv += optind;
        if (mode & (BROADCAST | NETWORK | NETPREFIX)) {
-               if (argc - optind > 2) {
+               if (argc > 2 || argc <= 0)
                        bb_show_usage();
-               }
        } else {
-               if (argc - optind != 1) {
+               if (argc != 1)
                        bb_show_usage();
-               }
        }
 
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
-        prefixstr = ipstr = argv[optind];
+       prefixstr = ipstr = argv[0];
 
-        while(*prefixstr) {
-                if (*prefixstr == '/') {
-                        *prefixstr = (char)0;
-                        prefixstr++;
-                        if (*prefixstr) {
+       while(*prefixstr) {
+               if (*prefixstr == '/') {
+                       *prefixstr = (char)0;
+                       prefixstr++;
+                       if (*prefixstr) {
                                unsigned int msk;
 
-                                                               if (safe_strtoul(prefixstr, &netprefix) || netprefix > 32) {
-                                        IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s\n", prefixstr),
-                                                exit(EXIT_FAILURE));
-                                }
+                               if (safe_strtoul(prefixstr, &netprefix) || netprefix > 32) {
+                                       IPCALC_MSG(bb_error_msg_and_die("bad IP prefix: %s\n", prefixstr),
+                                                       exit(EXIT_FAILURE));
+                               }
                                netmask = 0;
                                msk = 0x80000000;
                                while (netprefix > 0) {
                                        netmask |= msk;
                                        msk >>= 1;
-                                                netprefix--;
-                                        }
-                                        netmask = htonl(netmask);
-                                /* Even if it was 0, we will signify that we have a netmask. This allows */
-                                /* for specification of default routes, etc which have a 0 netmask/prefix */
-                                have_netmask = 1;
-                        }
-                        break;
-                }
-                prefixstr++;
-        }
+                                       netprefix--;
+                               }
+                               netmask = htonl(netmask);
+                               /* Even if it was 0, we will signify that we have a netmask. This allows */
+                               /* for specification of default routes, etc which have a 0 netmask/prefix */
+                               have_netmask = 1;
+                       }
+                       break;
+               }
+               prefixstr++;
+       }
        ipaddr = inet_aton(ipstr, &a);
 #else
-       ipaddr = inet_aton(argv[optind], &a);
+       ipaddr = inet_aton(argv[0], &a);
 #endif
 
        if (ipaddr == 0) {
-               IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[optind]),
-                                  exit(EXIT_FAILURE));
+               IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[0]),
+                               exit(EXIT_FAILURE));
        }
        ipaddr = a.s_addr;
 
-       if (argc - optind == 2) {
+       if (argc == 2) {
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
-              if (have_netmask) {
-                        IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"),
-                                exit(EXIT_FAILURE));
-                }
+               if (have_netmask) {
+                       IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"),
+                                       exit(EXIT_FAILURE));
+               }
 
 #endif
-               netmask = inet_aton(argv[optind + 1], &a);
+               netmask = inet_aton(argv[1], &a);
                if (netmask == 0) {
-               IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[optind + 1]),
-                                  exit(EXIT_FAILURE));
-       }
+                       IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[1]),
+                                       exit(EXIT_FAILURE));
+               }
                netmask = a.s_addr;
        } else {
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
 
                if (!have_netmask)
 #endif
-       /* JHC - If the netmask wasn't provided then calculate it */
-               netmask = get_netmask(ipaddr);
+                       /* JHC - If the netmask wasn't provided then calculate it */
+                       netmask = get_netmask(ipaddr);
        }
 
        if (mode & NETMASK) {
@@ -188,9 +190,9 @@ int ipcalc_main(int argc, char **argv)
        }
 
 #ifdef CONFIG_FEATURE_IPCALC_FANCY
-        if (mode & NETPREFIX) {
-                printf("PREFIX=%i\n", get_prefix(netmask));
-        }
+       if (mode & NETPREFIX) {
+               printf("PREFIX=%i\n", get_prefix(netmask));
+       }
 
        if (mode & HOSTNAME) {
                struct hostent *hostinfo;
@@ -199,7 +201,7 @@ int ipcalc_main(int argc, char **argv)
                hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
                if (!hostinfo) {
                        IPCALC_MSG(bb_herror_msg_and_die(
-                               "cannot find hostname for %s", argv[optind]),);
+                                               "cannot find hostname for %s", argv[0]),);
                        exit(EXIT_FAILURE);
                }
                for (x = 0; hostinfo->h_name[x]; x++) {