diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/ifconfig.c | 10 | ||||
| -rw-r--r-- | networking/ifupdown.c | 7 | ||||
| -rw-r--r-- | networking/nc_bloaty.c | 3 | ||||
| -rw-r--r-- | networking/zcip.c | 3 |
4 files changed, 10 insertions, 13 deletions
diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 863d6e4..1e960d4 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c @@ -260,7 +260,7 @@ static int in_ether(const char *bufp, struct sockaddr *sap); * Our main function. */ int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ifconfig_main(int argc, char **argv) +int ifconfig_main(int argc UNUSED_PARAM, char **argv) { struct ifreq ifr; struct sockaddr_in sai; @@ -291,19 +291,17 @@ int ifconfig_main(int argc, char **argv) /* skip argv[0] */ ++argv; - --argc; #if ENABLE_FEATURE_IFCONFIG_STATUS - if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { + if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { interface_opt_a = 1; - --argc; ++argv; } #endif - if (argc <= 1) { + if (!argv[0] || !argv[1]) { /* one or no args */ #if ENABLE_FEATURE_IFCONFIG_STATUS - return display_interfaces(argc ? *argv : NULL); + return display_interfaces(argv[0] /* can be NULL */); #else bb_error_msg_and_die("no support for status display"); #endif diff --git a/networking/ifupdown.c b/networking/ifupdown.c index d28c0b8..51b3626 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c @@ -1142,7 +1142,7 @@ static llist_t *read_iface_state(void) int ifupdown_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int ifupdown_main(int argc, char **argv) +int ifupdown_main(int argc UNUSED_PARAM, char **argv) { int (*cmds)(struct interface_defn_t *); struct interfaces_file_t *defn; @@ -1161,7 +1161,8 @@ int ifupdown_main(int argc, char **argv) } getopt32(argv, OPTION_STR, &interfaces); - if (argc - optind > 0) { + argv += optind; + if (argv[0]) { if (DO_ALL) bb_show_usage(); } else { if (!DO_ALL) bb_show_usage(); @@ -1175,7 +1176,7 @@ int ifupdown_main(int argc, char **argv) if (DO_ALL) { target_list = defn->autointerfaces; } else { - llist_add_to_end(&target_list, argv[optind]); + llist_add_to_end(&target_list, argv[0]); } /* Update the interfaces */ diff --git a/networking/nc_bloaty.c b/networking/nc_bloaty.c index ad98bed..9d7c23d 100644 --- a/networking/nc_bloaty.c +++ b/networking/nc_bloaty.c @@ -673,7 +673,7 @@ Debug("wrote %d to net, errno %d", rr, errno); /* main: now we pull it all together... */ int nc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int nc_main(int argc, char **argv) +int nc_main(int argc UNUSED_PARAM, char **argv) { char *str_p, *str_s; IF_NC_EXTRA(char *str_i, *str_o;) @@ -702,7 +702,6 @@ int nc_main(int argc, char **argv) while (*++proggie) { if (strcmp(*proggie, "-e") == 0) { *proggie = NULL; - argc = proggie - argv; proggie++; goto e_found; } diff --git a/networking/zcip.c b/networking/zcip.c index df4c0ec..a4da5cb 100644 --- a/networking/zcip.c +++ b/networking/zcip.c @@ -182,7 +182,7 @@ static ALWAYS_INLINE unsigned random_delay_ms(unsigned secs) * main program */ int zcip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; -int zcip_main(int argc, char **argv) +int zcip_main(int argc UNUSED_PARAM, char **argv) { int state; char *r_opt; @@ -241,7 +241,6 @@ int zcip_main(int argc, char **argv) bb_error_msg_and_die("invalid link address"); } } - argc -= optind; argv += optind - 1; /* Now: argv[0]:junk argv[1]:intf argv[2]:script argv[3]:NULL */ |