1 files changed, 12 insertions, 2 deletions

diff --git a/win32/popen.c b/win32/popen.c
index 6b8e52ca9..59f5ca9f0 100644
--- a/win32/popen.c
+++ b/win32/popen.c
@@ -1,5 +1,6 @@
 #include <fcntl.h>
 #include "libbb.h"
+#include "NUM_APPLETS.h"
 
 typedef struct {
         PROCESS_INFORMATION piProcInfo;
@@ -90,13 +91,22 @@ FILE *mingw_popen(const char *cmd, const char *mode)
                 }
         }
 
-        len = strlen(cmd) + 10 + count;
+        len = strlen(bb_busybox_exec_path) + strlen(cmd) + 32 + count;
         if ( (cmd_buff=malloc(len)) == NULL ) {
                 return NULL;
         }
 
+#if (ENABLE_FEATURE_PREFER_APPLETS || ENABLE_FEATURE_SH_STANDALONE) && \
+                NUM_APPLETS > 1
+        if (find_applet_by_name("sh") >= 0) {
+                strcpy(cmd_buff, bb_busybox_exec_path);
+                strcat(cmd_buff, " --busybox sh -c \"");
+        }
+        else
+#endif
+                strcpy(cmd_buff, "sh -c \"");
+
         /* escape double quotes */
-        strcpy(cmd_buff, "sh -c \"");
         for ( s=cmd,t=cmd_buff+strlen(cmd_buff); *s; ++s ) {
                 if ( *s == '"' ) {
                         *t++ = '\\';