Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/networking/ipcalc.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (17 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/networking/ipcalc.c (modified) (14 diffs)

branches/2.2.5/mindi-busybox/networking/ipcalc.c

@@ -1 @@
-/* vi: set sw=4 ts=4 ai: */
+/* vi: set sw=4 ts=4: */
 /*
  * Mini ipcalc implementation for busybox
@@ -13 +13 @@
  */
 
-#include "busybox.h"
-#include <ctype.h>
 #include <getopt.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#define IPCALC_MSG(CMD,ALTCMD) if (mode & SILENT) {ALTCMD;} else {CMD;}
+#include "libbb.h"
 
 #define CLASS_A_NETMASK ntohl(0xFF000000)
@@ -39 +37 @@
 }
 
-#ifdef CONFIG_FEATURE_IPCALC_FANCY
+#if ENABLE_FEATURE_IPCALC_FANCY
 static int get_prefix(unsigned long netmask)
 {
@@ -46 +44 @@
 
     netmask = htonl(netmask);
-    while(msk) {
+    while (msk) {
         if (netmask & msk)
             ret++;
@@ -57 +55 @@
 #endif
 
+
 #define NETMASK   0x01
 #define BROADCAST 0x02
@@ -65 +64 @@
 
 #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
-    static const struct option long_options[] = {
-        {"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'},
-#endif
-        {NULL, 0, NULL, 0}
-    };
-#else
-#define long_options 0
+    static const char ipcalc_longopts[] ALIGN1 =
+        "netmask\0"   No_argument "m"
+        "broadcast\0" No_argument "b"
+        "network\0"   No_argument "n"
+# if ENABLE_FEATURE_IPCALC_FANCY
+        "prefix\0"    No_argument "p"
+        "hostname\0"  No_argument "h"
+        "silent\0"    No_argument "s"
+# endif
+        ;
 #endif
 
-
-
+int ipcalc_main(int argc, char **argv);
 int ipcalc_main(int argc, char **argv)
 {
-    unsigned long mode;
+    unsigned opt;
     int have_netmask = 0;
     in_addr_t netmask, broadcast, network, ipaddr;
@@ -90 +85 @@
     char *ipstr;
 
-    if (ENABLE_FEATURE_IPCALC_LONG_OPTIONS)
-        bb_applet_long_options = long_options;
-
-    mode = bb_getopt_ulflags(argc, argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs"));
-
+#if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
+    applet_long_options = ipcalc_longopts;
+#endif
+    opt = getopt32(argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs"));
     argc -= optind;
     argv += optind;
-    if (mode & (BROADCAST | NETWORK | NETPREFIX)) {
+    if (opt & (BROADCAST | NETWORK | NETPREFIX)) {
         if (argc > 2 || argc <= 0)
             bb_show_usage();
@@ -104 +98 @@
             bb_show_usage();
     }
+    if (opt & SILENT)
+        logmode = LOGMODE_NONE; /* Suppress error_msg() output */
 
     ipstr = argv[0];
@@ -112 +108 @@
         prefixstr = ipstr;
 
-        while(*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));
-                    }
+                    unsigned msk;
+                    netprefix = xatoul_range(prefixstr, 0, 32);
                     netmask = 0;
                     msk = 0x80000000;
@@ -143 +135 @@
 
     if (ipaddr == 0) {
-        IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[0]),
-                exit(EXIT_FAILURE));
+        bb_error_msg_and_die("bad IP address: %s", argv[0]);
     }
     ipaddr = a.s_addr;
@@ -150 +141 @@
     if (argc == 2) {
         if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) {
-            IPCALC_MSG(bb_error_msg_and_die("Use prefix or netmask, not both.\n"),
-                    exit(EXIT_FAILURE));
+            bb_error_msg_and_die("use prefix or netmask, not both");
         }
 
         netmask = inet_aton(argv[1], &a);
         if (netmask == 0) {
-            IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[1]),
-                    exit(EXIT_FAILURE));
+            bb_error_msg_and_die("bad netmask: %s", argv[1]);
         }
         netmask = a.s_addr;
@@ -167 +156 @@
     }
 
-    if (mode & NETMASK) {
+    if (opt & NETMASK) {
         printf("NETMASK=%s\n", inet_ntoa((*(struct in_addr *) &netmask)));
     }
 
-    if (mode & BROADCAST) {
+    if (opt & BROADCAST) {
         broadcast = (ipaddr & netmask) | ~netmask;
         printf("BROADCAST=%s\n", inet_ntoa((*(struct in_addr *) &broadcast)));
     }
 
-    if (mode & NETWORK) {
+    if (opt & NETWORK) {
         network = ipaddr & netmask;
         printf("NETWORK=%s\n", inet_ntoa((*(struct in_addr *) &network)));
@@ -182 +171 @@
 
     if (ENABLE_FEATURE_IPCALC_FANCY) {
-        if (mode & NETPREFIX) {
+        if (opt & NETPREFIX) {
             printf("PREFIX=%i\n", get_prefix(netmask));
         }
 
-        if (mode & HOSTNAME) {
+        if (opt & HOSTNAME) {
             struct hostent *hostinfo;
             int x;
@@ -192 +181 @@
             hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
             if (!hostinfo) {
-                IPCALC_MSG(bb_herror_msg_and_die(
-                            "cannot find hostname for %s", argv[0]),);
-                exit(EXIT_FAILURE);
+                bb_herror_msg_and_die("cannot find hostname for %s", argv[0]);
             }
             for (x = 0; hostinfo->h_name[x]; x++) {