Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/ipcalc.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/networking/ipcalc.c (modified) (7 diffs)

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

@@ -10 +10 @@
  * is no denying that this is a loving reimplementation
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-#include <getopt.h>
-#include <sys/socket.h>
+#include "libbb.h"
+/* After libbb.h, because on some systems it needs other includes */
 #include <arpa/inet.h>
 
-#include "libbb.h"
-
-#define CLASS_A_NETMASK ntohl(0xFF000000)
-#define CLASS_B_NETMASK ntohl(0xFFFF0000)
-#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
+#define CLASS_A_NETMASK ntohl(0xFF000000)
+#define CLASS_B_NETMASK ntohl(0xFFFF0000)
+#define CLASS_C_NETMASK ntohl(0xFFFFFF00)
 
 static unsigned long get_netmask(unsigned long ipaddr)
@@ -65 +62 @@
 #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS
     static const char ipcalc_longopts[] ALIGN1 =
-        "netmask\0"   No_argument "m"
-        "broadcast\0" No_argument "b"
-        "network\0"   No_argument "n"
+        "netmask\0"   No_argument "m" // netmask from IP (assuming complete class A, B, or C network)
+        "broadcast\0" No_argument "b" // broadcast from IP [netmask]
+        "network\0"   No_argument "n" // network from IP [netmask]
 # if ENABLE_FEATURE_IPCALC_FANCY
-        "prefix\0"    No_argument "p"
-        "hostname\0"  No_argument "h"
-        "silent\0"    No_argument "s"
+        "prefix\0"    No_argument "p" // prefix from IP[/prefix] [netmask]
+        "hostname\0"  No_argument "h" // hostname from IP
+        "silent\0"    No_argument "s" // don’t ever display error messages
 # endif
         ;
 #endif
 
-int ipcalc_main(int argc, char **argv);
-int ipcalc_main(int argc, char **argv)
+int ipcalc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ipcalc_main(int argc UNUSED_PARAM, char **argv)
 {
     unsigned opt;
-    int have_netmask = 0;
-    in_addr_t netmask, broadcast, network, ipaddr;
-    struct in_addr a;
+    bool have_netmask = 0;
+    struct in_addr s_netmask, s_broadcast, s_network, s_ipaddr;
+    /* struct in_addr { in_addr_t s_addr; }  and  in_addr_t
+     * (which in turn is just a typedef to uint32_t)
+     * are essentially the same type. A few macros for less verbosity: */
+#define netmask   (s_netmask.s_addr)
+#define broadcast (s_broadcast.s_addr)
+#define network   (s_network.s_addr)
+#define ipaddr    (s_ipaddr.s_addr)
     char *ipstr;
 
@@ -88 +91 @@
     applet_long_options = ipcalc_longopts;
 #endif
-    opt = getopt32(argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs"));
-    argc -= optind;
+    opt_complementary = "-1:?2"; /* minimum 1 arg, maximum 2 args */
+    opt = getopt32(argv, "mbn" IF_FEATURE_IPCALC_FANCY("phs"));
     argv += optind;
-    if (opt & (BROADCAST | NETWORK | NETPREFIX)) {
-        if (argc > 2 || argc <= 0)
-            bb_show_usage();
-    } else {
-        if (argc != 1)
+    if (opt & SILENT)
+        logmode = LOGMODE_NONE; /* suppress error_msg() output */
+    opt &= ~SILENT;
+    if (!(opt & (BROADCAST | NETWORK | NETPREFIX))) {
+        /* if no options at all or
+         * (no broadcast,network,prefix) and (two args)... */
+        if (!opt || argv[1])
             bb_show_usage();
     }
-    if (opt & SILENT)
-        logmode = LOGMODE_NONE; /* Suppress error_msg() output */
 
     ipstr = argv[0];
@@ -110 +113 @@
         while (*prefixstr) {
             if (*prefixstr == '/') {
-                *prefixstr = (char)0;
-                prefixstr++;
+                *prefixstr++ = '\0';
                 if (*prefixstr) {
                     unsigned msk;
@@ -132 +134 @@
         }
     }
-    ipaddr = inet_aton(ipstr, &a);
 
-    if (ipaddr == 0) {
+    if (inet_aton(ipstr, &s_ipaddr) == 0) {
         bb_error_msg_and_die("bad IP address: %s", argv[0]);
     }
-    ipaddr = a.s_addr;
 
-    if (argc == 2) {
+    if (argv[1]) {
         if (ENABLE_FEATURE_IPCALC_FANCY && have_netmask) {
             bb_error_msg_and_die("use prefix or netmask, not both");
         }
-
-        netmask = inet_aton(argv[1], &a);
-        if (netmask == 0) {
+        if (inet_aton(argv[1], &s_netmask) == 0) {
             bb_error_msg_and_die("bad netmask: %s", argv[1]);
         }
-        netmask = a.s_addr;
     } else {
-
         /* JHC - If the netmask wasn't provided then calculate it */
         if (!ENABLE_FEATURE_IPCALC_FANCY || !have_netmask)
@@ -157 +153 @@
 
     if (opt & NETMASK) {
-        printf("NETMASK=%s\n", inet_ntoa((*(struct in_addr *) &netmask)));
+        printf("NETMASK=%s\n", inet_ntoa(s_netmask));
     }
 
     if (opt & BROADCAST) {
         broadcast = (ipaddr & netmask) | ~netmask;
-        printf("BROADCAST=%s\n", inet_ntoa((*(struct in_addr *) &broadcast)));
+        printf("BROADCAST=%s\n", inet_ntoa(s_broadcast));
     }
 
     if (opt & NETWORK) {
         network = ipaddr & netmask;
-        printf("NETWORK=%s\n", inet_ntoa((*(struct in_addr *) &network)));
+        printf("NETWORK=%s\n", inet_ntoa(s_network));
     }
 
@@ -177 +173 @@
         if (opt & HOSTNAME) {
             struct hostent *hostinfo;
-            int x;
 
             hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
             if (!hostinfo) {
-                bb_herror_msg_and_die("cannot find hostname for %s", argv[0]);
+                bb_herror_msg_and_die("can't find hostname for %s", argv[0]);
             }
-            for (x = 0; hostinfo->h_name[x]; x++) {
-                hostinfo->h_name[x] = tolower(hostinfo->h_name[x]);
-            }
+            str_tolower(hostinfo->h_name);
 
             printf("HOSTNAME=%s\n", hostinfo->h_name);