1 files changed, 21 insertions, 22 deletions
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index 3165c2d68..2b95c3250 100644
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -181,27 +181,26 @@ int udhcpc_main(int argc, char **argv)
                OPT_v = 1 << 17,
        };
 #if ENABLE_GETOPT_LONG
-        static const struct option arg_options[] = {
+        static const char udhcpc_longopts[] =
-                { "clientid",   required_argument,      0, 'c' },
+                "clientid\0"      Required_argument "c"
-                { "clientid-none", no_argument,         0, 'C' },
+                "clientid-none\0" No_argument       "C"
-                { "vendorclass", required_argument,     0, 'V' },
+                "vendorclass\0"   Required_argument "V"
-                { "foreground", no_argument,            0, 'f' },
+                "foreground\0"    No_argument       "f"
-                { "background", no_argument,            0, 'b' },
+                "background\0"    No_argument       "b"
-                { "hostname",   required_argument,      0, 'H' },
+                "hostname\0"      Required_argument "H"
-                { "hostname",   required_argument,      0, 'h' },
+                "hostname\0"      Required_argument "h"
-                { "fqdn",       required_argument,      0, 'F' },
+                "fqdn\0"          Required_argument "F"
-                { "interface",  required_argument,      0, 'i' },
+                "interface\0"     Required_argument "i"
-                { "now",        no_argument,            0, 'n' },
+                "now\0"           No_argument       "n"
-                { "pidfile",    required_argument,      0, 'p' },
+                "pidfile\0"       Required_argument "p"
-                { "quit",       no_argument,            0, 'q' },
+                "quit\0"          No_argument       "q"
-                { "release",    no_argument,            0, 'R' },
+                "release\0"       No_argument       "R"
-                { "request",    required_argument,      0, 'r' },
+                "request\0"       Required_argument "r"
-                { "script",     required_argument,      0, 's' },
+                "script\0"        Required_argument "s"
-                { "timeout",    required_argument,      0, 'T' },
+                "timeout\0"       Required_argument "T"
-                { "version",    no_argument,            0, 'v' },
+                "version\0"       No_argument       "v"
-                { "retries",    required_argument,      0, 't' },
+                "retries\0"       Required_argument "t"
-                { 0, 0, 0, 0 }
+                "\0";
-        };
 #endif
        /* Default options. */
        client_config.interface = "eth0";
@@ -213,7 +212,7 @@ int udhcpc_main(int argc, char **argv)
        opt_complementary = "c--C:C--c" // mutually exclusive
                            ":hH:Hh"; // -h and -H are the same
 #if ENABLE_GETOPT_LONG
-        applet_long_options = arg_options;
+        applet_long_options = udhcpc_longopts;
 #endif
        opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v",
                &str_c, &str_V, &str_h, &str_h, &str_F,

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index 3165c2d68..2b95c3250 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c
@@ -181,27 +181,26 @@ int udhcpc_main(int argc, char **argv)
181	OPT_v = 1 << 17,	181	OPT_v = 1 << 17,
182	};	182	};
183	#if ENABLE_GETOPT_LONG	183	#if ENABLE_GETOPT_LONG
184	static const struct option arg_options[] = {	184	static const char udhcpc_longopts[] =
185	{ "clientid", required_argument, 0, 'c' },	185	"clientid\0" Required_argument "c"
186	{ "clientid-none", no_argument, 0, 'C' },	186	"clientid-none\0" No_argument "C"
187	{ "vendorclass", required_argument, 0, 'V' },	187	"vendorclass\0" Required_argument "V"
188	{ "foreground", no_argument, 0, 'f' },	188	"foreground\0" No_argument "f"
189	{ "background", no_argument, 0, 'b' },	189	"background\0" No_argument "b"
190	{ "hostname", required_argument, 0, 'H' },	190	"hostname\0" Required_argument "H"
191	{ "hostname", required_argument, 0, 'h' },	191	"hostname\0" Required_argument "h"
192	{ "fqdn", required_argument, 0, 'F' },	192	"fqdn\0" Required_argument "F"
193	{ "interface", required_argument, 0, 'i' },	193	"interface\0" Required_argument "i"
194	{ "now", no_argument, 0, 'n' },	194	"now\0" No_argument "n"
195	{ "pidfile", required_argument, 0, 'p' },	195	"pidfile\0" Required_argument "p"
196	{ "quit", no_argument, 0, 'q' },	196	"quit\0" No_argument "q"
197	{ "release", no_argument, 0, 'R' },	197	"release\0" No_argument "R"
198	{ "request", required_argument, 0, 'r' },	198	"request\0" Required_argument "r"
199	{ "script", required_argument, 0, 's' },	199	"script\0" Required_argument "s"
200	{ "timeout", required_argument, 0, 'T' },	200	"timeout\0" Required_argument "T"
201	{ "version", no_argument, 0, 'v' },	201	"version\0" No_argument "v"
202	{ "retries", required_argument, 0, 't' },	202	"retries\0" Required_argument "t"
203	{ 0, 0, 0, 0 }	203	"\0";
204	};
205	#endif	204	#endif
206	/* Default options. */	205	/* Default options. */
207	client_config.interface = "eth0";	206	client_config.interface = "eth0";
@@ -213,7 +212,7 @@ int udhcpc_main(int argc, char **argv)
213	opt_complementary = "c--C:C--c" // mutually exclusive	212	opt_complementary = "c--C:C--c" // mutually exclusive
214	":hH:Hh"; // -h and -H are the same	213	":hH:Hh"; // -h and -H are the same
215	#if ENABLE_GETOPT_LONG	214	#if ENABLE_GETOPT_LONG
216	applet_long_options = arg_options;	215	applet_long_options = udhcpc_longopts;
217	#endif	216	#endif
218	opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v",	217	opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:v",
219	&str_c, &str_V, &str_h, &str_h, &str_F,	218	&str_c, &str_V, &str_h, &str_h, &str_F,