Changeset 1060

Timestamp:

03/30/2006 06:01:37 AM (2 years ago)

Author:

moo

Message:

fixed #441

Files:

• branches/lighttpd-merge-1.4.x/src/proc_open.c (modified) (3 diffs)

branches/lighttpd-merge-1.4.x/src/proc_open.c

@@ -149 +149 @@
         BOOL procok;
         SECURITY_ATTRIBUTES security;
-        const char *shell;
+        const char *shell = NULL;
+        const char *windir = NULL;
         buffer *cmdline;
 
-        if (NULL == (shell = getenv(SHELLENV))) {
-                fprintf(stderr, "env %s is required", SHELLENV);
+        if (NULL == (shell = getenv(SHELLENV)) &&
+                        NULL == (windir = getenv("SystemRoot")) &&
+                        NULL == (windir = getenv("windir"))) {
+                fprintf(stderr, "One of %s,%%SystemRoot,%%windir is required", SHELLENV);
                 return -1;
         }
@@ -178 +181 @@
 
         cmdline = buffer_init();
-        buffer_append_string(cmdline, shell);
+        if (shell) {
+                buffer_append_string(cmdline, shell);
+        } else {
+                buffer_append_string(cmdline, windir);
+                buffer_append_string(cmdline, "\\system32\\cmd.exe");
+        }
         buffer_append_string_len(cmdline, CONST_STR_LEN(" /c "));
         buffer_append_string(cmdline, command);
         procok = CreateProcess(NULL, cmdline->ptr, &security, &security, TRUE,
                         NORMAL_PRIORITY_CLASS, NULL, NULL, &si, &pi);
+
+        if (FALSE == procok) {
+                fprintf(stderr, "failed to CreateProcess: %s", cmdline->ptr);
+                buffer_free(cmdline);
+                return -1;
+        }
         buffer_free(cmdline);
-
-        if (FALSE == procok) {
-                fprintf(stderr, "failed to CreateProcess");
-                return -1;
-        }
 
         proc->child = pi.hProcess;
@@ -227 +236 @@
 
         if (NULL == (shell = getenv(SHELLENV))) {
-                fprintf(stderr, "env %s is required", SHELLENV);
-                return -1;
+                shell = "/bin/sh";
         }