Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/networking/libiproute/ip_parse_common_args.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/libiproute/ip_parse_common_args.c (modified) (2 diffs)

branches/2.2.9/mindi-busybox/networking/libiproute/ip_parse_common_args.c

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ip.c     "ip" utility frontend.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
  *
- *      This program is free software; you can redistribute it and/or
- *      modify it under the terms of the GNU General Public License
- *      as published by the Free Software Foundation; either version
- *      2 of the License, or (at your option) any later version.
- *
- * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
- *
+ * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
  *
  * Changes:
  *
- * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
  */
 
@@ -19 +16 @@
 #include "utils.h"
 
-int preferred_family = AF_UNSPEC;
+family_t preferred_family = AF_UNSPEC;
 smallint oneline;
 char _SL_;
 
-void ip_parse_common_args(int *argcp, char ***argvp)
+char** FAST_FUNC ip_parse_common_args(char **argv)
 {
-    int argc = *argcp;
-    char **argv = *argvp;
     static const char ip_common_commands[] ALIGN1 =
-        "-family\0""inet\0""inet6\0""link\0"
-        "-4\0""-6\0""-0\0""-oneline\0";
+        "oneline" "\0"
+        "family" "\0"
+        "4" "\0"
+        "6" "\0"
+        "0" "\0"
+        ;
     enum {
-        ARG_family = 1,
-        ARG_inet,
-        ARG_inet6,
-        ARG_link,
+        ARG_oneline,
+        ARG_family,
         ARG_IPv4,
         ARG_IPv6,
         ARG_packet,
-        ARG_oneline
     };
-    smalluint arg;
+    static const family_t af_numbers[] = { AF_INET, AF_INET6, AF_PACKET };
+    int arg;
 
-    while (argc > 1) {
-        char *opt = argv[1];
+    while (*argv) {
+        char *opt = *argv;
 
-        if (strcmp(opt,"--") == 0) {
-            argc--;
-            argv++;
-            break;
-        }
         if (opt[0] != '-')
             break;
-        if (opt[1] == '-')
+        opt++;
+        if (opt[0] == '-') {
             opt++;
-        arg = index_in_strings(ip_common_commands, opt) + 1;
+            if (!opt[0]) { /* "--" */
+                argv++;
+                break;
+            }
+        }
+        arg = index_in_substrings(ip_common_commands, opt);
+        if (arg < 0)
+            bb_show_usage();
+        if (arg == ARG_oneline) {
+            oneline = 1;
+            argv++;
+            continue;
+        }
         if (arg == ARG_family) {
-            argc--;
+            static const char families[] ALIGN1 =
+                "inet" "\0" "inet6" "\0" "link" "\0";
             argv++;
-            if (!argv[1])
+            if (!*argv)
                 bb_show_usage();
-            arg = index_in_strings(ip_common_commands, argv[1]) + 1;
-            if (arg == ARG_inet)
-                preferred_family = AF_INET;
-            else if (arg == ARG_inet6)
-                preferred_family = AF_INET6;
-            else if (arg == ARG_link)
-                preferred_family = AF_PACKET;
-            else
-                invarg(argv[1], "protocol family");
-        } else if (arg == ARG_IPv4) {
-            preferred_family = AF_INET;
-        } else if (arg == ARG_IPv6) {
-            preferred_family = AF_INET6;
-        } else if (arg == ARG_packet) {
-            preferred_family = AF_PACKET;
-        } else if (arg == ARG_oneline) {
-            ++oneline;
+            arg = index_in_strings(families, *argv);
+            if (arg < 0)
+                invarg(*argv, "protocol family");
+            /* now arg == 0, 1 or 2 */
         } else {
-            bb_show_usage();
+            arg -= ARG_IPv4;
+            /* now arg == 0, 1 or 2 */
         }
-        argc--;
+        preferred_family = af_numbers[arg];
         argv++;
     }
     _SL_ = oneline ? '\\' : '\n';
-    *argcp = argc;
-    *argvp = argv;
+    return argv;
 }