diff options
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ash.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/shell/ash.c b/shell/ash.c index 235eb8b7d..5b73c3c66 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
| @@ -9197,7 +9197,7 @@ static void shellexec(char *prog, char **argv, const char *path, int idx) | |||
| 9197 | if (has_path(prog) | 9197 | if (has_path(prog) |
| 9198 | #endif | 9198 | #endif |
| 9199 | #if ENABLE_FEATURE_SH_STANDALONE | 9199 | #if ENABLE_FEATURE_SH_STANDALONE |
| 9200 | || (applet_no = find_applet_by_name_with_path(prog, path)) >= 0 | 9200 | || (applet_no = find_applet_by_name_for_sh(prog, path)) >= 0 |
| 9201 | #endif | 9201 | #endif |
| 9202 | ) { | 9202 | ) { |
| 9203 | #if ENABLE_PLATFORM_MINGW32 | 9203 | #if ENABLE_PLATFORM_MINGW32 |
| @@ -9218,7 +9218,7 @@ static void shellexec(char *prog, char **argv, const char *path, int idx) | |||
| 9218 | if (unix_path(prog)) { | 9218 | if (unix_path(prog)) { |
| 9219 | const char *name = bb_basename(prog); | 9219 | const char *name = bb_basename(prog); |
| 9220 | # if ENABLE_FEATURE_SH_STANDALONE | 9220 | # if ENABLE_FEATURE_SH_STANDALONE |
| 9221 | if ((applet_no = find_applet_by_name_with_path(name, path)) >= 0) { | 9221 | if ((applet_no = find_applet_by_name_for_sh(name, path)) >= 0) { |
| 9222 | tryexec(applet_no, name, argv, envp); | 9222 | tryexec(applet_no, name, argv, envp); |
| 9223 | e = errno; | 9223 | e = errno; |
| 9224 | } | 9224 | } |
| @@ -15055,7 +15055,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) | |||
| 15055 | name = (char *)bb_basename(name); | 15055 | name = (char *)bb_basename(name); |
| 15056 | if ( | 15056 | if ( |
| 15057 | # if ENABLE_FEATURE_SH_STANDALONE | 15057 | # if ENABLE_FEATURE_SH_STANDALONE |
| 15058 | find_applet_by_name_with_path(name, path) >= 0 || | 15058 | find_applet_by_name_for_sh(name, path) >= 0 || |
| 15059 | # endif | 15059 | # endif |
| 15060 | !find_builtin(bb_basename(name)) | 15060 | !find_builtin(bb_basename(name)) |
| 15061 | ) { | 15061 | ) { |
| @@ -15126,7 +15126,7 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path) | |||
| 15126 | 15126 | ||
| 15127 | #if ENABLE_FEATURE_SH_STANDALONE | 15127 | #if ENABLE_FEATURE_SH_STANDALONE |
| 15128 | { | 15128 | { |
| 15129 | int applet_no = find_applet_by_name_with_path(name, path); | 15129 | int applet_no = find_applet_by_name_for_sh(name, path); |
| 15130 | if (applet_no >= 0) { | 15130 | if (applet_no >= 0) { |
| 15131 | entry->cmdtype = CMDNORMAL; | 15131 | entry->cmdtype = CMDNORMAL; |
| 15132 | entry->u.index = -2 - applet_no; | 15132 | entry->u.index = -2 - applet_no; |
| @@ -15379,7 +15379,7 @@ helpcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM) | |||
| 15379 | { | 15379 | { |
| 15380 | const char *a = applet_names; | 15380 | const char *a = applet_names; |
| 15381 | while (*a) { | 15381 | while (*a) { |
| 15382 | if (is_applet_preferred(a, pathval())) { | 15382 | if (prefer_applet(a, pathval())) { |
| 15383 | col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), a); | 15383 | col += out1fmt("%c%s", ((col == 0) ? '\t' : ' '), a); |
| 15384 | if (col > 60) { | 15384 | if (col > 60) { |
| 15385 | out1fmt("\n"); | 15385 | out1fmt("\n"); |
