aboutsummaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 47ad85440..6a03ef6b4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -8729,7 +8729,11 @@ static void shellexec(char *prog, char **argv, const char *path, int idx)
8729 int applet_no = -1; /* used only by FEATURE_SH_STANDALONE */ 8729 int applet_no = -1; /* used only by FEATURE_SH_STANDALONE */
8730 8730
8731 envp = listvars(VEXPORT, VUNSET, /*strlist:*/ NULL, /*end:*/ NULL); 8731 envp = listvars(VEXPORT, VUNSET, /*strlist:*/ NULL, /*end:*/ NULL);
8732 if ((strchr(prog, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(prog, '\\'))) 8732#if ENABLE_PLATFORM_MINGW32
8733 if ((strchr(prog, '/') || strchr(prog, '\\') || has_dos_drive_prefix(prog))
8734#else
8735 if (strchr(prog, '/') != NULL
8736#endif
8733#if ENABLE_FEATURE_SH_STANDALONE 8737#if ENABLE_FEATURE_SH_STANDALONE
8734 || (applet_no = find_applet_by_name(prog)) >= 0 8738 || (applet_no = find_applet_by_name(prog)) >= 0
8735#endif 8739#endif
@@ -14235,7 +14239,11 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
14235 int len; 14239 int len;
14236 14240
14237 /* If name contains a slash, don't use PATH or hash table */ 14241 /* If name contains a slash, don't use PATH or hash table */
14238 if (strchr(name, '/') || (ENABLE_PLATFORM_MINGW32 && strchr(name, '\\'))) { 14242#if ENABLE_PLATFORM_MINGW32
14243 if (strchr(name, '/') || strchr(name, '\\') || has_dos_drive_prefix(name)) {
14244#else
14245 if (strchr(name, '/' != NULL) {
14246#endif
14239 entry->u.index = -1; 14247 entry->u.index = -1;
14240 if (act & DO_ABS) { 14248 if (act & DO_ABS) {
14241#if ENABLE_PLATFORM_MINGW32 14249#if ENABLE_PLATFORM_MINGW32