diff options
Diffstat (limited to 'networking/ifconfig.c')
-rw-r--r-- | networking/ifconfig.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/networking/ifconfig.c b/networking/ifconfig.c index 863d6e44a..1e960d45c 100644 --- a/networking/ifconfig.c +++ b/networking/ifconfig.c | |||
@@ -260,7 +260,7 @@ static int in_ether(const char *bufp, struct sockaddr *sap); | |||
260 | * Our main function. | 260 | * Our main function. |
261 | */ | 261 | */ |
262 | int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; | 262 | int ifconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; |
263 | int ifconfig_main(int argc, char **argv) | 263 | int ifconfig_main(int argc UNUSED_PARAM, char **argv) |
264 | { | 264 | { |
265 | struct ifreq ifr; | 265 | struct ifreq ifr; |
266 | struct sockaddr_in sai; | 266 | struct sockaddr_in sai; |
@@ -291,19 +291,17 @@ int ifconfig_main(int argc, char **argv) | |||
291 | 291 | ||
292 | /* skip argv[0] */ | 292 | /* skip argv[0] */ |
293 | ++argv; | 293 | ++argv; |
294 | --argc; | ||
295 | 294 | ||
296 | #if ENABLE_FEATURE_IFCONFIG_STATUS | 295 | #if ENABLE_FEATURE_IFCONFIG_STATUS |
297 | if (argc > 0 && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { | 296 | if (argv[0] && (argv[0][0] == '-' && argv[0][1] == 'a' && !argv[0][2])) { |
298 | interface_opt_a = 1; | 297 | interface_opt_a = 1; |
299 | --argc; | ||
300 | ++argv; | 298 | ++argv; |
301 | } | 299 | } |
302 | #endif | 300 | #endif |
303 | 301 | ||
304 | if (argc <= 1) { | 302 | if (!argv[0] || !argv[1]) { /* one or no args */ |
305 | #if ENABLE_FEATURE_IFCONFIG_STATUS | 303 | #if ENABLE_FEATURE_IFCONFIG_STATUS |
306 | return display_interfaces(argc ? *argv : NULL); | 304 | return display_interfaces(argv[0] /* can be NULL */); |
307 | #else | 305 | #else |
308 | bb_error_msg_and_die("no support for status display"); | 306 | bb_error_msg_and_die("no support for status display"); |
309 | #endif | 307 | #endif |