diff options
| author | Eric Andersen <andersen@codepoet.org> | 2002-09-17 08:41:08 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2002-09-17 08:41:08 +0000 |
| commit | bf8bf105fb9866f35aee0cb835bc972d0056afa3 (patch) | |
| tree | 49d0cc5c45ede0e61cc9ce632d1f149f9870e426 /shell | |
| parent | 34fd00af5f70b26562d509f6602fde2957633ea6 (diff) | |
| download | busybox-w32-bf8bf105fb9866f35aee0cb835bc972d0056afa3.tar.gz busybox-w32-bf8bf105fb9866f35aee0cb835bc972d0056afa3.tar.bz2 busybox-w32-bf8bf105fb9866f35aee0cb835bc972d0056afa3.zip | |
Patch from "Joe.C" <joe@numa.com.tw>
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c index 216f1c4e9..715adc393 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -3060,7 +3060,12 @@ static void shellexec(char **argv, char **envp, const char *path, int idx) | |||
| 3060 | char *cmdname; | 3060 | char *cmdname; |
| 3061 | int e; | 3061 | int e; |
| 3062 | 3062 | ||
| 3063 | if (strchr(argv[0], '/') != NULL) { | 3063 | if (strchr(argv[0], '/') != NULL |
| 3064 | #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL | ||
| 3065 | || find_applet_by_name(argv[0]) | ||
| 3066 | #endif | ||
| 3067 | ) | ||
| 3068 | { | ||
| 3064 | tryexec(argv[0], argv, envp); | 3069 | tryexec(argv[0], argv, envp); |
| 3065 | e = errno; | 3070 | e = errno; |
| 3066 | } else { | 3071 | } else { |
| @@ -3539,6 +3544,14 @@ find_command(const char *name, struct cmdentry *entry, int act, | |||
| 3539 | return; | 3544 | return; |
| 3540 | } | 3545 | } |
| 3541 | 3546 | ||
| 3547 | #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL | ||
| 3548 | if (find_applet_by_name(name)) { | ||
| 3549 | entry->cmdtype = CMDNORMAL; | ||
| 3550 | entry->u.index = -1; | ||
| 3551 | return; | ||
| 3552 | } | ||
| 3553 | #endif | ||
| 3554 | |||
| 3542 | updatetbl = 1; | 3555 | updatetbl = 1; |
| 3543 | if (act & DO_BRUTE) { | 3556 | if (act & DO_BRUTE) { |
| 3544 | firstchange = path_change(path, &bltin); | 3557 | firstchange = path_change(path, &bltin); |
