Ticket #441: proc_open.c.2.diff

src/proc_open.c

@@ +1 @@
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -148 +149 @@
         STARTUPINFO si;
         BOOL procok;
         SECURITY_ATTRIBUTES security;
-        const char *shell;
+        char *shell;
         buffer *cmdline;
 
         if (NULL == (shell = getenv(SHELLENV))) {
-                fprintf(stderr, "env %s is required", SHELLENV);
-                return -1;
+                if (NULL == (shell = getenv("WINDIR"))) {
+                        fprintf(stderr, "neither %s nor WINDIR in env, can't guess shell path\n", SHELLENV);
+                        return -1;
+                }
+                shell = strcat(shell, "\\system32\\cmd.exe");
         }
 
         /* we use this to allow the child to inherit handles */
@@ -225 +229 @@
         pid_t child;
         const char *shell;
 
-        if (NULL == (shell = getenv(SHELLENV))) {
-                fprintf(stderr, "env %s is required", SHELLENV);
-                return -1;
-        }
+        if (NULL == (shell = getenv(SHELLENV)))
+                shell = "/bin/sh";
 
         if (proc_open_pipes(proc) != 0) {
                 return -1;