diff options
author | Ron Yorston <rmy@pobox.com> | 2017-07-29 10:03:45 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2017-07-29 10:03:45 +0100 |
commit | bf35303101df45b43188bacf80840034aef40c45 (patch) | |
tree | b070fe5877d548ca604cab38028f71f62bc1210e /shell | |
parent | 86d60bb0ceb277e500a8daabd995bc713bbdadc9 (diff) | |
download | busybox-w32-bf35303101df45b43188bacf80840034aef40c45.tar.gz busybox-w32-bf35303101df45b43188bacf80840034aef40c45.tar.bz2 busybox-w32-bf35303101df45b43188bacf80840034aef40c45.zip |
ash: remove old code to tab-complete 'busybox' in standalone shell
Diffstat (limited to 'shell')
-rw-r--r-- | shell/ash.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/shell/ash.c b/shell/ash.c index 6aaeecfac..b71c749aa 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -8150,11 +8150,6 @@ static void shellexec(char *prog, char **argv, const char *path, int idx) | |||
8150 | goto try_PATH; | 8150 | goto try_PATH; |
8151 | } | 8151 | } |
8152 | e = errno; | 8152 | e = errno; |
8153 | #if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_SH_STANDALONE | ||
8154 | } else if (strcmp(argv[0], "busybox") == 0) { | ||
8155 | tryexec(-1, bb_busybox_exec_path, argv, envp); | ||
8156 | e = errno; | ||
8157 | #endif | ||
8158 | } else { | 8153 | } else { |
8159 | try_PATH: | 8154 | try_PATH: |
8160 | e = ENOENT; | 8155 | e = ENOENT; |
@@ -13377,9 +13372,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) | |||
13377 | #if ENABLE_FEATURE_SH_STANDALONE | 13372 | #if ENABLE_FEATURE_SH_STANDALONE |
13378 | { | 13373 | { |
13379 | int applet_no = find_applet_by_name(name); | 13374 | int applet_no = find_applet_by_name(name); |
13380 | if (applet_no >= 0 || | 13375 | if (applet_no >= 0) { |
13381 | /* requires find_applet_by_name to return -1 on no match */ | ||
13382 | (ENABLE_PLATFORM_MINGW32 && strcmp(name, "busybox") == 0)) { | ||
13383 | entry->cmdtype = CMDNORMAL; | 13376 | entry->cmdtype = CMDNORMAL; |
13384 | entry->u.index = -2 - applet_no; | 13377 | entry->u.index = -2 - applet_no; |
13385 | return; | 13378 | return; |