diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-18 15:32:12 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-18 15:32:12 +0000 |
commit | fe7cd642b0b732f5d41403c2f6983ad676b69dd9 (patch) | |
tree | e5962885cb72c976f44b178a350a92ba5f1aa02d /networking | |
parent | d6cd9d7fe9eab19a9e36fdda729c78c40205b1e5 (diff) | |
download | busybox-w32-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.tar.gz busybox-w32-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.tar.bz2 busybox-w32-fe7cd642b0b732f5d41403c2f6983ad676b69dd9.zip |
don't pass argc in getopt32, it's superfluous
(add/remove: 0/0 grow/shrink: 12/131 up/down: 91/-727) Total: -636 bytes
text data bss dec hex filename
773469 1058 11092 785619 bfcd3 busybox_old
772644 1058 11092 784794 bf99a busybox_unstripped
Diffstat (limited to 'networking')
-rw-r--r-- | networking/arp.c | 2 | ||||
-rw-r--r-- | networking/arping.c | 2 | ||||
-rw-r--r-- | networking/dnsd.c | 2 | ||||
-rw-r--r-- | networking/ether-wake.c | 2 | ||||
-rw-r--r-- | networking/ftpgetput.c | 2 | ||||
-rw-r--r-- | networking/hostname.c | 2 | ||||
-rw-r--r-- | networking/httpd.c | 2 | ||||
-rw-r--r-- | networking/ifupdown.c | 2 | ||||
-rw-r--r-- | networking/inetd.c | 2 | ||||
-rw-r--r-- | networking/ipcalc.c | 2 | ||||
-rw-r--r-- | networking/isrv_identd.c | 2 | ||||
-rw-r--r-- | networking/nameif.c | 2 | ||||
-rw-r--r-- | networking/nc_bloaty.c | 2 | ||||
-rw-r--r-- | networking/netstat.c | 2 | ||||
-rw-r--r-- | networking/ping.c | 2 | ||||
-rw-r--r-- | networking/pscan.c | 2 | ||||
-rw-r--r-- | networking/route.c | 2 | ||||
-rw-r--r-- | networking/slattach.c | 2 | ||||
-rw-r--r-- | networking/telnet.c | 2 | ||||
-rw-r--r-- | networking/telnetd.c | 2 | ||||
-rw-r--r-- | networking/tftp.c | 2 | ||||
-rw-r--r-- | networking/traceroute.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dhcpd.c | 2 | ||||
-rw-r--r-- | networking/udhcp/dumpleases.c | 2 | ||||
-rw-r--r-- | networking/wget.c | 2 | ||||
-rw-r--r-- | networking/zcip.c | 2 |
27 files changed, 27 insertions, 27 deletions
diff --git a/networking/arp.c b/networking/arp.c index a5a737349..8cdee1832 100644 --- a/networking/arp.c +++ b/networking/arp.c | |||
@@ -445,7 +445,7 @@ int arp_main(int argc, char **argv) | |||
445 | if (!ap) | 445 | if (!ap) |
446 | bb_error_msg_and_die("%s: %s not supported", DFLT_AF, "address family"); | 446 | bb_error_msg_and_die("%s: %s not supported", DFLT_AF, "address family"); |
447 | 447 | ||
448 | getopt32(argc, argv, "A:p:H:t:i:adnDsv", &protocol, &protocol, | 448 | getopt32(argv, "A:p:H:t:i:adnDsv", &protocol, &protocol, |
449 | &hw_type, &hw_type, &device); | 449 | &hw_type, &hw_type, &device); |
450 | argv += optind; | 450 | argv += optind; |
451 | if (option_mask32 & ARP_OPT_A || option_mask32 & ARP_OPT_p) { | 451 | if (option_mask32 & ARP_OPT_A || option_mask32 & ARP_OPT_p) { |
diff --git a/networking/arping.c b/networking/arping.c index 8e457b13a..a2c4c2247 100644 --- a/networking/arping.c +++ b/networking/arping.c | |||
@@ -249,7 +249,7 @@ int arping_main(int argc, char **argv) | |||
249 | * Advert also sets unsolicited. | 249 | * Advert also sets unsolicited. |
250 | */ | 250 | */ |
251 | opt_complementary = "=1:Df:AU"; | 251 | opt_complementary = "=1:Df:AU"; |
252 | opt = getopt32(argc, argv, "DUAqfbc:w:I:s:", | 252 | opt = getopt32(argv, "DUAqfbc:w:I:s:", |
253 | &str_count, &str_timeout, &device, &source); | 253 | &str_count, &str_timeout, &device, &source); |
254 | if (opt & 0x40) /* -c: count */ | 254 | if (opt & 0x40) /* -c: count */ |
255 | count = xatou(str_count); | 255 | count = xatou(str_count); |
diff --git a/networking/dnsd.c b/networking/dnsd.c index 672b729e0..c906de32a 100644 --- a/networking/dnsd.c +++ b/networking/dnsd.c | |||
@@ -338,7 +338,7 @@ int dnsd_main(int argc, char **argv) | |||
338 | uint16_t port = 53; | 338 | uint16_t port = 53; |
339 | uint8_t buf[MAX_PACK_LEN]; | 339 | uint8_t buf[MAX_PACK_LEN]; |
340 | 340 | ||
341 | getopt32(argc, argv, "i:c:t:p:dv", &listen_interface, &fileconf, &sttl, &sport); | 341 | getopt32(argv, "i:c:t:p:dv", &listen_interface, &fileconf, &sttl, &sport); |
342 | //if (option_mask32 & 0x1) // -i | 342 | //if (option_mask32 & 0x1) // -i |
343 | //if (option_mask32 & 0x2) // -c | 343 | //if (option_mask32 & 0x2) // -c |
344 | if (option_mask32 & 0x4) // -t | 344 | if (option_mask32 & 0x4) // -t |
diff --git a/networking/ether-wake.c b/networking/ether-wake.c index b67e1b5d8..36713837a 100644 --- a/networking/ether-wake.c +++ b/networking/ether-wake.c | |||
@@ -195,7 +195,7 @@ int ether_wake_main(int argc, char **argv) | |||
195 | 195 | ||
196 | /* handle misc user options */ | 196 | /* handle misc user options */ |
197 | opt_complementary = "=1"; | 197 | opt_complementary = "=1"; |
198 | flags = getopt32(argc, argv, "bi:p:", &ifname, &pass); | 198 | flags = getopt32(argv, "bi:p:", &ifname, &pass); |
199 | if (flags & 4) /* -p */ | 199 | if (flags & 4) /* -p */ |
200 | wol_passwd_sz = get_wol_pw(pass, wol_passwd); | 200 | wol_passwd_sz = get_wol_pw(pass, wol_passwd); |
201 | flags &= 1; /* we further interested only in -b [bcast] flag */ | 201 | flags &= 1; /* we further interested only in -b [bcast] flag */ |
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c index 255e413cb..d7e2bfa5d 100644 --- a/networking/ftpgetput.c +++ b/networking/ftpgetput.c | |||
@@ -331,7 +331,7 @@ int ftpgetput_main(int argc, char **argv) | |||
331 | applet_long_options = ftpgetput_longopts; | 331 | applet_long_options = ftpgetput_longopts; |
332 | #endif | 332 | #endif |
333 | opt_complementary = "=3"; /* must have 3 params */ | 333 | opt_complementary = "=3"; /* must have 3 params */ |
334 | opt = getopt32(argc, argv, "cvu:p:P:", &server->user, &server->password, &port); | 334 | opt = getopt32(argv, "cvu:p:P:", &server->user, &server->password, &port); |
335 | argv += optind; | 335 | argv += optind; |
336 | 336 | ||
337 | /* Process the non-option command line arguments */ | 337 | /* Process the non-option command line arguments */ |
diff --git a/networking/hostname.c b/networking/hostname.c index 862bbdfa2..95dc4515d 100644 --- a/networking/hostname.c +++ b/networking/hostname.c | |||
@@ -60,7 +60,7 @@ int hostname_main(int argc, char **argv) | |||
60 | if (argc < 1) | 60 | if (argc < 1) |
61 | bb_show_usage(); | 61 | bb_show_usage(); |
62 | 62 | ||
63 | getopt32(argc, argv, "dfisF:", &hostname_str); | 63 | getopt32(argv, "dfisF:", &hostname_str); |
64 | 64 | ||
65 | /* Output in desired format */ | 65 | /* Output in desired format */ |
66 | if (option_mask32 & OPT_dfis) { | 66 | if (option_mask32 & OPT_dfis) { |
diff --git a/networking/httpd.c b/networking/httpd.c index 072714435..c837d67ad 100644 --- a/networking/httpd.c +++ b/networking/httpd.c | |||
@@ -1975,7 +1975,7 @@ int httpd_main(int argc, char **argv) | |||
1975 | /* We do not "absolutize" path given by -h (home) opt. | 1975 | /* We do not "absolutize" path given by -h (home) opt. |
1976 | * If user gives relative path in -h, $SCRIPT_FILENAME can end up | 1976 | * If user gives relative path in -h, $SCRIPT_FILENAME can end up |
1977 | * relative too. */ | 1977 | * relative too. */ |
1978 | opt = getopt32(argc, argv, "c:d:h:" | 1978 | opt = getopt32(argv, "c:d:h:" |
1979 | USE_FEATURE_HTTPD_ENCODE_URL_STR("e:") | 1979 | USE_FEATURE_HTTPD_ENCODE_URL_STR("e:") |
1980 | USE_FEATURE_HTTPD_BASIC_AUTH("r:") | 1980 | USE_FEATURE_HTTPD_BASIC_AUTH("r:") |
1981 | USE_FEATURE_HTTPD_AUTH_MD5("m:") | 1981 | USE_FEATURE_HTTPD_AUTH_MD5("m:") |
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index e1c1e652b..128cc37bd 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -1148,7 +1148,7 @@ int ifupdown_main(int argc, char **argv) | |||
1148 | cmds = iface_up; | 1148 | cmds = iface_up; |
1149 | } | 1149 | } |
1150 | 1150 | ||
1151 | getopt32(argc, argv, OPTION_STR, &interfaces); | 1151 | getopt32(argv, OPTION_STR, &interfaces); |
1152 | if (argc - optind > 0) { | 1152 | if (argc - optind > 0) { |
1153 | if (DO_ALL) bb_show_usage(); | 1153 | if (DO_ALL) bb_show_usage(); |
1154 | } else { | 1154 | } else { |
diff --git a/networking/inetd.c b/networking/inetd.c index a7517ebdf..e4e9f95b0 100644 --- a/networking/inetd.c +++ b/networking/inetd.c | |||
@@ -1278,7 +1278,7 @@ int inetd_main(int argc, char **argv) | |||
1278 | if (uid != 0) | 1278 | if (uid != 0) |
1279 | config_filename = NULL; | 1279 | config_filename = NULL; |
1280 | 1280 | ||
1281 | opt = getopt32(argc, argv, "R:f", &stoomany); | 1281 | opt = getopt32(argv, "R:f", &stoomany); |
1282 | if (opt & 1) | 1282 | if (opt & 1) |
1283 | toomany = xatoi_u(stoomany); | 1283 | toomany = xatoi_u(stoomany); |
1284 | argv += optind; | 1284 | argv += optind; |
diff --git a/networking/ipcalc.c b/networking/ipcalc.c index 3f99b7511..759704379 100644 --- a/networking/ipcalc.c +++ b/networking/ipcalc.c | |||
@@ -87,7 +87,7 @@ int ipcalc_main(int argc, char **argv) | |||
87 | #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS | 87 | #if ENABLE_FEATURE_IPCALC_LONG_OPTIONS |
88 | applet_long_options = ipcalc_longopts; | 88 | applet_long_options = ipcalc_longopts; |
89 | #endif | 89 | #endif |
90 | opt = getopt32(argc, argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs")); | 90 | opt = getopt32(argv, "mbn" USE_FEATURE_IPCALC_FANCY("phs")); |
91 | argc -= optind; | 91 | argc -= optind; |
92 | argv += optind; | 92 | argv += optind; |
93 | if (opt & (BROADCAST | NETWORK | NETPREFIX)) { | 93 | if (opt & (BROADCAST | NETWORK | NETPREFIX)) { |
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c index 84cf6da6a..23f6758a0 100644 --- a/networking/isrv_identd.c +++ b/networking/isrv_identd.c | |||
@@ -107,7 +107,7 @@ int fakeidentd_main(int argc, char **argv) | |||
107 | unsigned opt; | 107 | unsigned opt; |
108 | int fd; | 108 | int fd; |
109 | 109 | ||
110 | opt = getopt32(argc, argv, "fiwb:", &bind_address); | 110 | opt = getopt32(argv, "fiwb:", &bind_address); |
111 | strcpy(bogouser, "nobody"); | 111 | strcpy(bogouser, "nobody"); |
112 | if (argv[optind]) | 112 | if (argv[optind]) |
113 | strncpy(bogouser, argv[optind], sizeof(bogouser)); | 113 | strncpy(bogouser, argv[optind], sizeof(bogouser)); |
diff --git a/networking/nameif.c b/networking/nameif.c index fd081fd63..daac191bf 100644 --- a/networking/nameif.c +++ b/networking/nameif.c | |||
@@ -66,7 +66,7 @@ int nameif_main(int argc, char **argv) | |||
66 | int if_index = 1; | 66 | int if_index = 1; |
67 | mactable_t *ch; | 67 | mactable_t *ch; |
68 | 68 | ||
69 | if (1 & getopt32(argc, argv, "sc:", &fname)) { | 69 | if (1 & getopt32(argv, "sc:", &fname)) { |
70 | openlog(applet_name, 0, LOG_LOCAL0); | 70 | openlog(applet_name, 0, LOG_LOCAL0); |
71 | logmode = LOGMODE_SYSLOG; | 71 | logmode = LOGMODE_SYSLOG; |
72 | } | 72 | } |
diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c index 30abb3c1c..ab8246531 100644 --- a/networking/nc_bloaty.c +++ b/networking/nc_bloaty.c | |||
@@ -706,7 +706,7 @@ int nc_main(int argc, char **argv) | |||
706 | 706 | ||
707 | // -g -G -t -r deleted, unimplemented -a deleted too | 707 | // -g -G -t -r deleted, unimplemented -a deleted too |
708 | opt_complementary = "?2:vv"; /* max 2 params, -v is a counter */ | 708 | opt_complementary = "?2:vv"; /* max 2 params, -v is a counter */ |
709 | getopt32(argc, argv, "hnp:s:uvw:" USE_NC_SERVER("l") | 709 | getopt32(argv, "hnp:s:uvw:" USE_NC_SERVER("l") |
710 | USE_NC_EXTRA("i:o:z"), | 710 | USE_NC_EXTRA("i:o:z"), |
711 | &str_p, &str_s, &str_w | 711 | &str_p, &str_s, &str_w |
712 | USE_NC_EXTRA(, &str_i, &str_o, &o_verbose)); | 712 | USE_NC_EXTRA(, &str_i, &str_o, &o_verbose)); |
diff --git a/networking/netstat.c b/networking/netstat.c index 9fd3d2f86..5bacb47cc 100644 --- a/networking/netstat.c +++ b/networking/netstat.c | |||
@@ -497,7 +497,7 @@ int netstat_main(int argc, char **argv) | |||
497 | #endif | 497 | #endif |
498 | 498 | ||
499 | /* Option string must match NETSTAT_xxx constants */ | 499 | /* Option string must match NETSTAT_xxx constants */ |
500 | opt = getopt32(argc, argv, NETSTAT_OPTS); | 500 | opt = getopt32(argv, NETSTAT_OPTS); |
501 | if (opt & 0x1) { // -l | 501 | if (opt & 0x1) { // -l |
502 | flags &= ~NETSTAT_CONNECTED; | 502 | flags &= ~NETSTAT_CONNECTED; |
503 | flags |= NETSTAT_LISTENING; | 503 | flags |= NETSTAT_LISTENING; |
diff --git a/networking/ping.c b/networking/ping.c index d1a413dd3..5d61cd768 100644 --- a/networking/ping.c +++ b/networking/ping.c | |||
@@ -689,7 +689,7 @@ int ping_main(int argc, char **argv) | |||
689 | 689 | ||
690 | /* exactly one argument needed, -v and -q don't mix */ | 690 | /* exactly one argument needed, -v and -q don't mix */ |
691 | opt_complementary = "=1:q--v:v--q"; | 691 | opt_complementary = "=1:q--v:v--q"; |
692 | getopt32(argc, argv, OPT_STRING, &opt_c, &opt_s, &opt_I); | 692 | getopt32(argv, OPT_STRING, &opt_c, &opt_s, &opt_I); |
693 | if (option_mask32 & OPT_c) pingcount = xatoul(opt_c); // -c | 693 | if (option_mask32 & OPT_c) pingcount = xatoul(opt_c); // -c |
694 | if (option_mask32 & OPT_s) datalen = xatou16(opt_s); // -s | 694 | if (option_mask32 & OPT_s) datalen = xatou16(opt_s); // -s |
695 | if (option_mask32 & OPT_I) { // -I | 695 | if (option_mask32 & OPT_I) { // -I |
diff --git a/networking/pscan.c b/networking/pscan.c index 9eda16865..5ae3e61dd 100644 --- a/networking/pscan.c +++ b/networking/pscan.c | |||
@@ -54,7 +54,7 @@ int pscan_main(int argc, char **argv) | |||
54 | unsigned start; | 54 | unsigned start; |
55 | 55 | ||
56 | opt_complementary = "=1"; /* exactly one non-option */ | 56 | opt_complementary = "=1"; /* exactly one non-option */ |
57 | getopt32(argc, argv, "p:P:t:T:", &opt_min_port, &opt_max_port, &opt_timeout, &opt_min_rtt); | 57 | getopt32(argv, "p:P:t:T:", &opt_min_port, &opt_max_port, &opt_timeout, &opt_min_rtt); |
58 | argv += optind; | 58 | argv += optind; |
59 | max_port = xatou_range(opt_max_port, 1, 65535); | 59 | max_port = xatou_range(opt_max_port, 1, 65535); |
60 | port = xatou_range(opt_min_port, 1, max_port); | 60 | port = xatou_range(opt_min_port, 1, max_port); |
diff --git a/networking/route.c b/networking/route.c index bfa58da2a..55a6c2155 100644 --- a/networking/route.c +++ b/networking/route.c | |||
@@ -656,7 +656,7 @@ int route_main(int argc, char **argv) | |||
656 | } | 656 | } |
657 | } | 657 | } |
658 | 658 | ||
659 | opt = getopt32(argc, argv, "A:ne", &family); | 659 | opt = getopt32(argv, "A:ne", &family); |
660 | 660 | ||
661 | if ((opt & ROUTE_OPT_A) && strcmp(family, "inet") != 0) { | 661 | if ((opt & ROUTE_OPT_A) && strcmp(family, "inet") != 0) { |
662 | #if ENABLE_FEATURE_IPV6 | 662 | #if ENABLE_FEATURE_IPV6 |
diff --git a/networking/slattach.c b/networking/slattach.c index f78c88e89..ce6d705a8 100644 --- a/networking/slattach.c +++ b/networking/slattach.c | |||
@@ -152,7 +152,7 @@ int slattach_main(int argc, char **argv) | |||
152 | INIT_G(); | 152 | INIT_G(); |
153 | 153 | ||
154 | /* Parse command line options */ | 154 | /* Parse command line options */ |
155 | opt = getopt32(argc, argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd); | 155 | opt = getopt32(argv, "p:s:c:ehmLF", &proto, &baud_str, &extcmd); |
156 | /*argc -= optind;*/ | 156 | /*argc -= optind;*/ |
157 | argv += optind; | 157 | argv += optind; |
158 | 158 | ||
diff --git a/networking/telnet.c b/networking/telnet.c index 4e8b27ba6..ae526fa9e 100644 --- a/networking/telnet.c +++ b/networking/telnet.c | |||
@@ -583,7 +583,7 @@ int telnet_main(int argc, char** argv) | |||
583 | bb_show_usage(); | 583 | bb_show_usage(); |
584 | 584 | ||
585 | #if ENABLE_FEATURE_TELNET_AUTOLOGIN | 585 | #if ENABLE_FEATURE_TELNET_AUTOLOGIN |
586 | if (1 & getopt32(argc, argv, "al:", &G.autologin)) | 586 | if (1 & getopt32(argv, "al:", &G.autologin)) |
587 | G.autologin = getenv("USER"); | 587 | G.autologin = getenv("USER"); |
588 | argv += optind; | 588 | argv += optind; |
589 | #else | 589 | #else |
diff --git a/networking/telnetd.c b/networking/telnetd.c index 9246f7052..b21991212 100644 --- a/networking/telnetd.c +++ b/networking/telnetd.c | |||
@@ -386,7 +386,7 @@ int telnetd_main(int argc, char **argv) | |||
386 | OPT_INETD = 0x20 * ENABLE_FEATURE_TELNETD_STANDALONE, | 386 | OPT_INETD = 0x20 * ENABLE_FEATURE_TELNETD_STANDALONE, |
387 | }; | 387 | }; |
388 | 388 | ||
389 | opt = getopt32(argc, argv, "f:l:" USE_FEATURE_TELNETD_STANDALONE("p:b:Fi"), | 389 | opt = getopt32(argv, "f:l:" USE_FEATURE_TELNETD_STANDALONE("p:b:Fi"), |
390 | &issuefile, &loginpath | 390 | &issuefile, &loginpath |
391 | USE_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)); | 391 | USE_FEATURE_TELNETD_STANDALONE(, &opt_portnbr, &opt_bindaddr)); |
392 | /* Redirect log to syslog early, if needed */ | 392 | /* Redirect log to syslog early, if needed */ |
diff --git a/networking/tftp.c b/networking/tftp.c index 030c0116e..6be265b4c 100644 --- a/networking/tftp.c +++ b/networking/tftp.c | |||
@@ -405,7 +405,7 @@ int tftp_main(int argc, char **argv) | |||
405 | opt_complementary = "" USE_FEATURE_TFTP_GET("g:") USE_FEATURE_TFTP_PUT("p:") | 405 | opt_complementary = "" USE_FEATURE_TFTP_GET("g:") USE_FEATURE_TFTP_PUT("p:") |
406 | USE_GETPUT("?g--p:p--g"); | 406 | USE_GETPUT("?g--p:p--g"); |
407 | 407 | ||
408 | USE_GETPUT(cmd =) getopt32(argc, argv, | 408 | USE_GETPUT(cmd =) getopt32(argv, |
409 | USE_FEATURE_TFTP_GET("g") USE_FEATURE_TFTP_PUT("p") | 409 | USE_FEATURE_TFTP_GET("g") USE_FEATURE_TFTP_PUT("p") |
410 | "l:r:" USE_FEATURE_TFTP_BLOCKSIZE("b:"), | 410 | "l:r:" USE_FEATURE_TFTP_BLOCKSIZE("b:"), |
411 | &localfile, &remotefile | 411 | &localfile, &remotefile |
diff --git a/networking/traceroute.c b/networking/traceroute.c index 0923d97dc..236ddbdaf 100644 --- a/networking/traceroute.c +++ b/networking/traceroute.c | |||
@@ -941,7 +941,7 @@ int traceroute_main(int argc, char **argv) | |||
941 | opt_complementary = "x-x"; | 941 | opt_complementary = "x-x"; |
942 | #endif | 942 | #endif |
943 | 943 | ||
944 | op = getopt32(argc, argv, "FIlnrdvxt:i:m:p:q:s:w:z:f:" | 944 | op = getopt32(argv, "FIlnrdvxt:i:m:p:q:s:w:z:f:" |
945 | #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE | 945 | #if ENABLE_FEATURE_TRACEROUTE_SOURCE_ROUTE |
946 | "g:" | 946 | "g:" |
947 | #endif | 947 | #endif |
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index f0a3351fd..961a1712a 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -215,7 +215,7 @@ int udhcpc_main(int argc, char **argv) | |||
215 | #if ENABLE_GETOPT_LONG | 215 | #if ENABLE_GETOPT_LONG |
216 | applet_long_options = udhcpc_longopts; | 216 | applet_long_options = udhcpc_longopts; |
217 | #endif | 217 | #endif |
218 | opt = getopt32(argc, argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:vS", | 218 | opt = getopt32(argv, "c:CV:fbH:h:F:i:np:qRr:s:T:t:vS", |
219 | &str_c, &str_V, &str_h, &str_h, &str_F, | 219 | &str_c, &str_V, &str_h, &str_h, &str_F, |
220 | &client_config.interface, &client_config.pidfile, &str_r, | 220 | &client_config.interface, &client_config.pidfile, &str_r, |
221 | &client_config.script, &str_T, &str_t | 221 | &client_config.script, &str_T, &str_t |
diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c index 2fd16ce9b..e722833e1 100644 --- a/networking/udhcp/dhcpd.c +++ b/networking/udhcp/dhcpd.c | |||
@@ -36,7 +36,7 @@ int udhcpd_main(int argc, char **argv) | |||
36 | struct option_set *option; | 36 | struct option_set *option; |
37 | struct dhcpOfferedAddr *lease, static_lease; | 37 | struct dhcpOfferedAddr *lease, static_lease; |
38 | 38 | ||
39 | opt = getopt32(argc, argv, "fS"); | 39 | opt = getopt32(argv, "fS"); |
40 | argv += optind; | 40 | argv += optind; |
41 | 41 | ||
42 | if (!(opt & 1)) { /* no -f */ | 42 | if (!(opt & 1)) { /* no -f */ |
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c index a0765be79..3e931c0b5 100644 --- a/networking/udhcp/dumpleases.c +++ b/networking/udhcp/dumpleases.c | |||
@@ -33,7 +33,7 @@ int dumpleases_main(int argc, char **argv) | |||
33 | applet_long_options = dumpleases_longopts; | 33 | applet_long_options = dumpleases_longopts; |
34 | #endif | 34 | #endif |
35 | opt_complementary = "=0:a--r:r--a"; | 35 | opt_complementary = "=0:a--r:r--a"; |
36 | opt = getopt32(argc, argv, "arf:", &file); | 36 | opt = getopt32(argv, "arf:", &file); |
37 | 37 | ||
38 | fd = xopen(file, O_RDONLY); | 38 | fd = xopen(file, O_RDONLY); |
39 | 39 | ||
diff --git a/networking/wget.c b/networking/wget.c index 3e61ea656..8af7a3399 100644 --- a/networking/wget.c +++ b/networking/wget.c | |||
@@ -147,7 +147,7 @@ int wget_main(int argc, char **argv) | |||
147 | #endif | 147 | #endif |
148 | /* server.allocated = target.allocated = NULL; */ | 148 | /* server.allocated = target.allocated = NULL; */ |
149 | opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::"); | 149 | opt_complementary = "-1" USE_FEATURE_WGET_LONG_OPTIONS(":\xfe::"); |
150 | opt = getopt32(argc, argv, "csqO:P:Y:U:", | 150 | opt = getopt32(argv, "csqO:P:Y:U:", |
151 | &fname_out, &dir_prefix, | 151 | &fname_out, &dir_prefix, |
152 | &proxy_flag, &user_agent | 152 | &proxy_flag, &user_agent |
153 | USE_FEATURE_WGET_LONG_OPTIONS(, &headers_llist) | 153 | USE_FEATURE_WGET_LONG_OPTIONS(, &headers_llist) |
diff --git a/networking/zcip.c b/networking/zcip.c index 0b5bebec4..2f0b5a7fb 100644 --- a/networking/zcip.c +++ b/networking/zcip.c | |||
@@ -203,7 +203,7 @@ int zcip_main(int argc, char **argv) | |||
203 | // parse commandline: prog [options] ifname script | 203 | // parse commandline: prog [options] ifname script |
204 | // exactly 2 args; -v accumulates and implies -f | 204 | // exactly 2 args; -v accumulates and implies -f |
205 | opt_complementary = "=2:vv:vf"; | 205 | opt_complementary = "=2:vv:vf"; |
206 | opts = getopt32(argc, argv, "fqr:v", &r_opt, &verbose); | 206 | opts = getopt32(argv, "fqr:v", &r_opt, &verbose); |
207 | if (!FOREGROUND) { | 207 | if (!FOREGROUND) { |
208 | /* Do it early, before all bb_xx_msg calls */ | 208 | /* Do it early, before all bb_xx_msg calls */ |
209 | openlog(applet_name, 0, LOG_DAEMON); | 209 | openlog(applet_name, 0, LOG_DAEMON); |