emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

touchup argc/argv handling to shrink a bit and fix a segfault when given wrong number of parameters as noted and fixed by Cristian Ionescu-Idbohrn

Browse Source
This commit is contained in:
Mike Frysinger 2005-09-24 23:48:18 +00:00
parent a630cb15b1
commit b7f88e01a4
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
networking/ipcalc.c
View File

@ -100,18 +100,19 @@ int ipcalc_main(int argc, char **argv)
"mbn" "mbn"
#endif #endif
); );
argc -= optind;
argv += optind;
if (mode & (BROADCAST | NETWORK | NETPREFIX)) { if (mode & (BROADCAST | NETWORK | NETPREFIX)) {
if (argc - optind > 2) { if (argc > 2 || argc <= 0)
bb_show_usage(); bb_show_usage();
}
} else { } else {
if (argc - optind != 1) { if (argc != 1)
bb_show_usage(); bb_show_usage();
}
} }
#ifdef CONFIG_FEATURE_IPCALC_FANCY #ifdef CONFIG_FEATURE_IPCALC_FANCY
prefixstr = ipstr = argv[optind]; prefixstr = ipstr = argv[0];
while(*prefixstr) { while(*prefixstr) {
if (*prefixstr == '/') { if (*prefixstr == '/') {
@ -142,16 +143,16 @@ int ipcalc_main(int argc, char **argv)
} }
ipaddr = inet_aton(ipstr, &a); ipaddr = inet_aton(ipstr, &a);
#else #else
ipaddr = inet_aton(argv[optind], &a); ipaddr = inet_aton(argv[0], &a);
#endif #endif
if (ipaddr == 0) { if (ipaddr == 0) {
IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[optind]), IPCALC_MSG(bb_error_msg_and_die("bad IP address: %s", argv[0]),
exit(EXIT_FAILURE)); exit(EXIT_FAILURE));
} }
ipaddr = a.s_addr; ipaddr = a.s_addr;
if (argc - optind == 2) { if (argc == 2) {
#ifdef CONFIG_FEATURE_IPCALC_FANCY #ifdef CONFIG_FEATURE_IPCALC_FANCY
if (have_netmask) { if (have_netmask) {
IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"), IPCALC_MSG(bb_error_msg_and_die("Both prefix and netmask were specified, use one or the other.\n"),
@ -159,9 +160,9 @@ int ipcalc_main(int argc, char **argv)
} }
#endif #endif
netmask = inet_aton(argv[optind + 1], &a); netmask = inet_aton(argv[1], &a);
if (netmask == 0) { if (netmask == 0) {
IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[optind + 1]), IPCALC_MSG(bb_error_msg_and_die("bad netmask: %s", argv[1]),
exit(EXIT_FAILURE)); exit(EXIT_FAILURE));
} }
netmask = a.s_addr; netmask = a.s_addr;
@ -200,7 +201,7 @@ int ipcalc_main(int argc, char **argv)
hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET); hostinfo = gethostbyaddr((char *) &ipaddr, sizeof(ipaddr), AF_INET);
if (!hostinfo) { if (!hostinfo) {
IPCALC_MSG(bb_herror_msg_and_die( IPCALC_MSG(bb_herror_msg_and_die(
"cannot find hostname for %s", argv[optind]),); "cannot find hostname for %s", argv[0]),);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
for (x = 0; hostinfo->h_name[x]; x++) { for (x = 0; hostinfo->h_name[x]; x++) {