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

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

@@ -1 +1 @@
 /* vi: set sw=4 ts=4: */
 /*
- * ip.c     "ip" utility frontend.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
- *
- * 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
- * Bernhard Fischer rewrote to use index_in_substr_array
+ * Rani Assaf <rani@magic.metawire.com> 980929: resolve addresses
+ * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 
@@ -25 +21 @@
  || ENABLE_FEATURE_IP_RULE
 
-static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av)
+static int FAST_FUNC ip_print_help(char **argv UNUSED_PARAM)
 {
     bb_show_usage();
 }
 
-static int (*ip_func)(int argc, char **argv) = ip_print_help;
+typedef int FAST_FUNC (*ip_func_ptr_t)(char**);
 
-static int ip_do(int argc, char **argv)
+static int ip_do(ip_func_ptr_t ip_func, char **argv)
 {
-    ip_parse_common_args(&argc, &argv);
-    return ip_func(argc-1, argv+1);
+    argv = ip_parse_common_args(argv + 1);
+    return ip_func(argv);
 }
 
 #if ENABLE_FEATURE_IP_ADDRESS
-int ipaddr_main(int argc, char **argv);
-int ipaddr_main(int argc, char **argv)
+int ipaddr_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ipaddr_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_ipaddr;
-    return ip_do(argc, argv);
+    return ip_do(do_ipaddr, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_LINK
-int iplink_main(int argc, char **argv);
-int iplink_main(int argc, char **argv)
+int iplink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iplink_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iplink;
-    return ip_do(argc, argv);
+    return ip_do(do_iplink, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_ROUTE
-int iproute_main(int argc, char **argv);
-int iproute_main(int argc, char **argv)
+int iproute_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iproute_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iproute;
-    return ip_do(argc, argv);
+    return ip_do(do_iproute, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_RULE
-int iprule_main(int argc, char **argv);
-int iprule_main(int argc, char **argv)
+int iprule_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iprule_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iprule;
-    return ip_do(argc, argv);
+    return ip_do(do_iprule, argv);
 }
 #endif
 #if ENABLE_FEATURE_IP_TUNNEL
-int iptunnel_main(int argc, char **argv);
-int iptunnel_main(int argc, char **argv)
+int iptunnel_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int iptunnel_main(int argc UNUSED_PARAM, char **argv)
 {
-    ip_func = do_iptunnel;
-    return ip_do(argc, argv);
+    return ip_do(do_iptunnel, argv);
 }
 #endif
 
 
-int ip_main(int argc, char **argv);
-int ip_main(int argc, char **argv)
+int ip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ip_main(int argc UNUSED_PARAM, char **argv)
 {
     static const char keywords[] ALIGN1 =
-        USE_FEATURE_IP_ADDRESS("address\0")
-        USE_FEATURE_IP_ROUTE("route\0")
-        USE_FEATURE_IP_LINK("link\0")
-        USE_FEATURE_IP_TUNNEL("tunnel\0" "tunl\0")
-        USE_FEATURE_IP_RULE("rule\0")
+        IF_FEATURE_IP_ADDRESS("address\0")
+        IF_FEATURE_IP_ROUTE("route\0")
+        IF_FEATURE_IP_ROUTE("r\0")
+        IF_FEATURE_IP_LINK("link\0")
+        IF_FEATURE_IP_TUNNEL("tunnel\0")
+        IF_FEATURE_IP_TUNNEL("tunl\0")
+        IF_FEATURE_IP_RULE("rule\0")
         ;
-    enum {
-        USE_FEATURE_IP_ADDRESS(IP_addr,)
-        USE_FEATURE_IP_ROUTE(IP_route,)
-        USE_FEATURE_IP_LINK(IP_link,)
-        USE_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
-        USE_FEATURE_IP_RULE(IP_rule,)
-        IP_none
+    static const ip_func_ptr_t ip_func_ptrs[] = {
+        ip_print_help,
+        IF_FEATURE_IP_ADDRESS(do_ipaddr,)
+        IF_FEATURE_IP_ROUTE(do_iproute,)
+        IF_FEATURE_IP_ROUTE(do_iproute,)
+        IF_FEATURE_IP_LINK(do_iplink,)
+        IF_FEATURE_IP_TUNNEL(do_iptunnel,)
+        IF_FEATURE_IP_TUNNEL(do_iptunnel,)
+        IF_FEATURE_IP_RULE(do_iprule,)
     };
+    ip_func_ptr_t ip_func;
+    int key;
 
-    ip_parse_common_args(&argc, &argv);
-    if (argc > 1) {
-        int key = index_in_substrings(keywords, argv[1]);
-        argc -= 2;
-        argv += 2;
-#if ENABLE_FEATURE_IP_ADDRESS
-        if (key == IP_addr)
-            ip_func = do_ipaddr;
-#endif
-#if ENABLE_FEATURE_IP_ROUTE
-        if (key == IP_route)
-            ip_func = do_iproute;
-#endif
-#if ENABLE_FEATURE_IP_LINK
-        if (key == IP_link)
-            ip_func = do_iplink;
-#endif
-#if ENABLE_FEATURE_IP_TUNNEL
-        if (key == IP_tunnel || key == IP_tunl)
-            ip_func = do_iptunnel;
-#endif
-#if ENABLE_FEATURE_IP_RULE
-        if (key == IP_rule)
-            ip_func = do_iprule;
-#endif
-    }
-    return ip_func(argc, argv);
+    argv = ip_parse_common_args(argv + 1);
+    key = *argv ? index_in_substrings(keywords, *argv++) : -1;
+    ip_func = ip_func_ptrs[key + 1];
+
+    return ip_func(argv);
 }