randomtest fixes

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

diff --git a/networking/ip.c b/networking/ip.c
index dd1d863da28d3b81308ffe1e0081f36831ea3f41..7a0f308f0caf5f3f43053954809e4d61c4a8dedf 100644 (file)
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -10,94 +10,92 @@
  * Changes:
  *
  * Rani Assaf <rani@magic.metawire.com> 980929:        resolve addresses
- * Bernhard Fischer rewrote to use index_in_substr_array
+ * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
 #include "libiproute/utils.h"
 #include "libiproute/ip_common.h"
 
-static int ATTRIBUTE_NORETURN ip_print_help(int ATTRIBUTE_UNUSED ac, char ATTRIBUTE_UNUSED **av)
+#if ENABLE_FEATURE_IP_ADDRESS \
+ || ENABLE_FEATURE_IP_ROUTE \
+ || ENABLE_FEATURE_IP_LINK \
+ || ENABLE_FEATURE_IP_TUNNEL \
+ || ENABLE_FEATURE_IP_RULE
+
+static int NORETURN ip_print_help(char **argv UNUSED_PARAM)
 {
        bb_show_usage();
 }
 
-static int (*ip_func)(int argc, char **argv) = ip_print_help;
-
-static int ip_do(int argc, char **argv)
+static int ip_do(int (*ip_func)(char **argv), 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)
 {
-       const char * const keywords[] = {
-               USE_FEATURE_IP_ADDRESS("address",)
-               USE_FEATURE_IP_ROUTE("route",)
-               USE_FEATURE_IP_LINK("link",)
-               USE_FEATURE_IP_TUNNEL("tunnel", "tunl",)
-               USE_FEATURE_IP_RULE("rule",)
-               NULL
-       };
+       static const char keywords[] ALIGN1 =
+               IF_FEATURE_IP_ADDRESS("address\0")
+               IF_FEATURE_IP_ROUTE("route\0")
+               IF_FEATURE_IP_LINK("link\0")
+               IF_FEATURE_IP_TUNNEL("tunnel\0" "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,)
+               IF_FEATURE_IP_ADDRESS(IP_addr,)
+               IF_FEATURE_IP_ROUTE(IP_route,)
+               IF_FEATURE_IP_LINK(IP_link,)
+               IF_FEATURE_IP_TUNNEL(IP_tunnel, IP_tunl,)
+               IF_FEATURE_IP_RULE(IP_rule,)
                IP_none
        };
+       int (*ip_func)(char**) = ip_print_help;
 
-       ip_parse_common_args(&argc, &argv);
-       if (argc > 1) {
-               int key = index_in_substr_array(keywords, argv[1]);
-               argc -= 2;
-               argv += 2;
+       argv = ip_parse_common_args(argv + 1);
+       if (*argv) {
+               int key = index_in_substrings(keywords, *argv);
+               argv++;
 #if ENABLE_FEATURE_IP_ADDRESS
                if (key == IP_addr)
                        ip_func = do_ipaddr;
@@ -119,5 +117,7 @@ int ip_main(int argc, char **argv)
                        ip_func = do_iprule;
 #endif
        }
-       return (ip_func(argc, argv));
+       return ip_func(argv);
 }
+
+#endif /* any of ENABLE_FEATURE_IP_xxx is 1 */