diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 20:40:51 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-21 20:40:51 +0000 |
| commit | f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f (patch) | |
| tree | b341f97661b629cc112ebe09933c044ebb31a6f7 /shell | |
| parent | 950bd729665cecf1fbee65bc6e57e087c93aaab6 (diff) | |
| download | busybox-w32-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.tar.gz busybox-w32-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.tar.bz2 busybox-w32-f9d4fc3cf8ca91dbebfa305c5c08f8781caa1a0f.zip | |
switch_root: improve behavior on error; improve help text
*: make "can't execute '%s'" message uniform
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/cttyhack.c | 2 | ||||
| -rw-r--r-- | shell/hush.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/shell/cttyhack.c b/shell/cttyhack.c index 0aa4b8a2c..572a3af03 100644 --- a/shell/cttyhack.c +++ b/shell/cttyhack.c | |||
| @@ -73,5 +73,5 @@ int cttyhack_main(int argc UNUSED_PARAM, char **argv) | |||
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | BB_EXECVP(argv[0], argv); | 75 | BB_EXECVP(argv[0], argv); |
| 76 | bb_perror_msg_and_die("cannot exec '%s'", argv[0]); | 76 | bb_perror_msg_and_die("can't execute '%s'", argv[0]); |
| 77 | } | 77 | } |
diff --git a/shell/hush.c b/shell/hush.c index 53b1f3f8b..56b12cebc 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -3048,7 +3048,7 @@ static void pseudo_exec_argv(nommu_save_t *nommu_save, | |||
| 3048 | debug_printf_exec("execing '%s'\n", argv[0]); | 3048 | debug_printf_exec("execing '%s'\n", argv[0]); |
| 3049 | sigprocmask(SIG_SETMASK, &G.inherited_set, NULL); | 3049 | sigprocmask(SIG_SETMASK, &G.inherited_set, NULL); |
| 3050 | execvp(argv[0], argv); | 3050 | execvp(argv[0], argv); |
| 3051 | bb_perror_msg("can't exec '%s'", argv[0]); | 3051 | bb_perror_msg("can't execute '%s'", argv[0]); |
| 3052 | _exit(EXIT_FAILURE); | 3052 | _exit(EXIT_FAILURE); |
| 3053 | } | 3053 | } |
| 3054 | 3054 | ||