mdev: fix a bug where we were eating argv[0] of helper

[oweals/busybox.git] / networking / udhcp / dhcpc.c

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index fe8f4c8fa9cb2d3e3e29a3855a3bba9270af3e3d..fb328cb030e796158cf0473ff7d463fb72930f99 100644 (file)
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -8,7 +8,6 @@
  * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
  */
 
-#include <getopt.h>
 #include <syslog.h>
 
 /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */
@@ -183,6 +182,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
                OPT_W = 1 << 21,
 #endif
                OPT_P = 1 << 22,
+               OPT_o = 1 << 23,
        };
 #if ENABLE_GETOPT_LONG
        static const char udhcpc_longopts[] ALIGN1 =
@@ -212,6 +212,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
 #if ENABLE_FEATURE_UDHCP_PORT
                "client-port\0"    Required_argument "P"
 #endif
+               "no-default-options\0" No_argument   "o"
                ;
 #endif
        /* Default options. */
@@ -231,7 +232,7 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
        opt = getopt32(argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:vSA:"
                USE_FEATURE_UDHCPC_ARPING("aW:")
                USE_FEATURE_UDHCP_PORT("P:")
-               "O:"
+               "O:o"
                , &str_c, &str_V, &str_h, &str_h, &str_F
                , &client_config.interface, &client_config.pidfile, &str_r
                , &client_config.script
@@ -292,6 +293,8 @@ int udhcpc_main(int argc ATTRIBUTE_UNUSED, char **argv)
                SERVER_PORT = CLIENT_PORT - 1;
        }
 #endif
+       if (opt & OPT_o)
+               client_config.no_default_options = 1;
        while (list_O) {
                int n = index_in_strings(dhcp_option_strings, list_O->data);
                if (n < 0)