ash: simplify spawning during forkshell

spawn_forkshell() uses mingw_spawn_proc() to start the child shell.
mingw_spawn_proc() then calls mingw_spawn_1() which determines
that "sh" is an applet, thus calling mingw_spawn_applet() which
finally calls spawnveq().

Not only is this convoluted it also won't work if PREFER_APPLETS
and SH_STANDALONE aren't enabled.

Simplify matters by adding a new function, mingw_spawn_forkshell(),
which is tailored for just this case.

3 files changed, 11 insertions, 1 deletions

diff --git a/include/mingw.h b/include/mingw.h
index 39d716521..26f0688d7 100644
--- a/include/mingw.h
+++ b/include/mingw.h
@@ -477,6 +477,7 @@ DIR *mingw_opendir(const char *path);
 pid_t FAST_FUNC mingw_spawn(char **argv);
 pid_t FAST_FUNC mingw_spawn_detach(char **argv);
 intptr_t FAST_FUNC mingw_spawn_proc(const char **argv);
+intptr_t FAST_FUNC mingw_spawn_forkshell(const char **argv);
 int mingw_execv(const char *cmd, char *const *argv);
 int mingw_execvp(const char *cmd, char *const *argv);
 int mingw_execve(const char *cmd, char *const *argv, char *const *envp);
diff --git a/shell/ash.c b/shell/ash.c
index 951e241ad..4a075d1ea 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -15627,7 +15627,7 @@ spawn_forkshell(struct forkshell *fs, struct job *jp, union node *n, int mode)
         new->nprocs = jp == NULL ? 0 : jp->nprocs;
         sprintf(buf, "%p", new->hMapFile);
         argv[2] = buf;
-        ret = mingw_spawn_proc(argv);
+        ret = mingw_spawn_forkshell(argv);
         CloseHandle(new->hMapFile);
         UnmapViewOfFile(new);
         if (ret == -1) {
diff --git a/win32/process.c b/win32/process.c
index d33f06405..04775100b 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -391,6 +391,15 @@ mingw_spawn_proc(const char **argv)
         return mingw_spawn_1(P_NOWAIT, argv[0], (char *const *)argv, environ);
 }
 
+#if ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH
+intptr_t FAST_FUNC
+mingw_spawn_forkshell(const char **argv)
+{
+   return spawnveq(P_NOWAIT, bb_busybox_exec_path, (char *const *)argv,
+                                        environ);
+}
+#endif
+
 int
 mingw_execvp(const char *cmd, char *const *argv)
 {