b32a54366
Denys Vlasenko
2010-08-29
Subject
nandwrite: complain on malformed -s NUM
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/printf.c +2 -2miscutils/nandwrite.c +2 -0procps/kill.c +2 -2procps/renice.c +1 -1shell/shell_common.c +1 -1
coreutils/printf.c+2 -2
| @@ -66,7 +66,7 @@ static int multiconvert(const char *arg, void *result, converter convert) | |
| errno = 0; | |
| convert(arg, result); | |
| if (errno) { | |
| - | bb_error_msg("%s: invalid number", arg); |
| + | bb_error_msg("invalid number '%s'", arg); |
| return 1; | |
| } | |
| return 0; | |
| @@ -230,7 +230,7 @@ static int get_width_prec(const char *str) | |
| { | |
| int v = bb_strtoi(str, NULL, 10); | |
| if (errno) { | |
| - | bb_error_msg("%s: invalid number", str); |
| + | bb_error_msg("invalid number '%s'", str); |
| v = 0; | |
| } | |
| return v; | |
miscutils/nandwrite.c+2 -0
| @@ -72,6 +72,8 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv) | |
| xioctl(fd, MEMGETINFO, &meminfo); | |
| mtdoffset = bb_strtou(opt_s, NULL, 0); | |
| + | if (errno) |
| + | bb_error_msg_and_die("invalid number '%s'", opt_s); |
| /* Pull it into a CPU register (hopefully) - smaller code that way */ | |
| meminfo_writesize = meminfo.writesize; | |
procps/kill.c+2 -2
| @@ -153,7 +153,7 @@ int kill_main(int argc, char **argv) | |
| arg = argv[i]; | |
| omit = bb_strtoi(arg, NULL, 10); | |
| if (errno) { | |
| - | bb_error_msg("bad pid '%s'", arg); |
| + | bb_error_msg("invalid number '%s'", arg); |
| ret = 1; | |
| goto resume; | |
| } | |
| @@ -211,7 +211,7 @@ int kill_main(int argc, char **argv) | |
| arg++; | |
| pid = bb_strtoi(arg, NULL, 10); | |
| if (errno) { | |
| - | bb_error_msg("bad pid '%s'", arg); |
| + | bb_error_msg("invalid number '%s'", arg); |
| errors++; | |
| } else if (kill(pid, signo) != 0) { | |
| bb_perror_msg("can't kill pid %d", (int)pid); | |
procps/renice.c+1 -1
| @@ -91,7 +91,7 @@ int renice_main(int argc UNUSED_PARAM, char **argv) | |
| } else { | |
| who = bb_strtou(arg, NULL, 10); | |
| if (errno) { | |
| - | bb_error_msg("bad value: %s", arg); |
| + | bb_error_msg("invalid number '%s'", arg); |
| goto HAD_ERROR; | |
| } | |
| } | |
shell/shell_common.c+1 -1
| @@ -422,7 +422,7 @@ shell_builtin_ulimit(char **argv) | |
| else | |
| val = bb_strtoull(val_str, NULL, 10); | |
| if (errno) { | |
| - | bb_error_msg("bad number"); |
| + | bb_error_msg("invalid number '%s'", val_str); |
| return EXIT_FAILURE; | |
| } | |
| val <<= l->factor_shift; | |