Refactoring in apr_proc_create() for Windows. No behavior changes expected.

* threadproc/win32/proc.c
  (apr_proc_create): Move progname to argv0 conversion to each case.

git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1929716 13f79535-47bb-0310-9956-ffa450edef68

Author: Ivan Zhakov

threadproc/win32/proc.c

@@ -479,7 +479,6 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
 {
     apr_status_t rv;
     apr_size_t i;
-    const char *argv0;
     char *cmdline;
     apr_wchar_t *pEnvBlock;
     PROCESS_INFORMATION pi;
@@ -550,15 +549,18 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
         }
     }
 
-    if (has_space(progname)) {
-        argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);
-    }
-    else {
-        argv0 = progname;
-    }
-
     if (attr->cmdtype == APR_SHELLCMD || attr->cmdtype == APR_SHELLCMD_ENV) {
-        char *shellcmd = getenv("COMSPEC");
+        const char *argv0;
+        char *shellcmd;
+
+        if (has_space(progname)) {
+            argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);
+        }
+        else {
+            argv0 = progname;
+        }
+
+        shellcmd = getenv("COMSPEC");
         if (!shellcmd) {
             if (attr->errfn) {
                 attr->errfn(pool, APR_EINVAL, "COMSPEC envar is not set");
@@ -600,6 +602,15 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
         if (i >= 4 && (strcasecmp(progname + i - 4, ".bat") == 0
                     || strcasecmp(progname + i - 4, ".cmd") == 0))
         {
+            const char *argv0;
+
+            if (has_space(progname)) {
+                argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);
+            }
+            else {
+                argv0 = progname;
+            }
+
             char *shellcmd = getenv("COMSPEC");
             if (!shellcmd) {
                 if (attr->errfn) {
@@ -648,6 +659,15 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
             }
         }
         else {
+            const char *argv0;
+
+            if (has_space(progname)) {
+                argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);
+            }
+            else {
+                argv0 = progname;
+            }
+
             /* A simple command we are directly invoking.
              * Handle the args, seperate from argv0 */
             cmdline = apr_pstrdup(pool, argv0);