diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:57:26 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 13:57:26 +1000 |
commit | 0c9d2455301ed633826e222aacd930126990913e (patch) | |
tree | 2353a480f55dfa41d9e6d2fa328af1b60dd3653e /shell/shell_common.c | |
parent | e8db4fe96b3a68b6f971d88084ef2fd2c8513e78 (diff) | |
parent | 9dc04124d5a3f0c9be249287817a964691e187b0 (diff) | |
download | busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.gz busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.bz2 busybox-w32-0c9d2455301ed633826e222aacd930126990913e.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'shell/shell_common.c')
-rw-r--r-- | shell/shell_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/shell/shell_common.c b/shell/shell_common.c index 957d71928..0b9d4ebe6 100644 --- a/shell/shell_common.c +++ b/shell/shell_common.c | |||
@@ -14,7 +14,7 @@ | |||
14 | * Copyright (c) 2010 Denys Vlasenko | 14 | * Copyright (c) 2010 Denys Vlasenko |
15 | * Split from ash.c | 15 | * Split from ash.c |
16 | * | 16 | * |
17 | * Licensed under the GPL v2 or later, see the file LICENSE in this tarball. | 17 | * Licensed under GPLv2 or later, see file LICENSE in this source tree. |
18 | */ | 18 | */ |
19 | #include "libbb.h" | 19 | #include "libbb.h" |
20 | #include "shell_common.h" | 20 | #include "shell_common.h" |
@@ -429,7 +429,7 @@ shell_builtin_ulimit(char **argv) | |||
429 | else | 429 | else |
430 | val = bb_strtoull(val_str, NULL, 10); | 430 | val = bb_strtoull(val_str, NULL, 10); |
431 | if (errno) { | 431 | if (errno) { |
432 | bb_error_msg("bad number"); | 432 | bb_error_msg("invalid number '%s'", val_str); |
433 | return EXIT_FAILURE; | 433 | return EXIT_FAILURE; |
434 | } | 434 | } |
435 | val <<= l->factor_shift; | 435 | val <<= l->factor_shift; |