Follow-up to r1929716: Move variable declaration at the beginning of scope to

Ivan Zhakov · Ivan Zhakov · commit d064663bb1e0 · 2025-11-13T18:27:57.000Z
support C89. git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1929717 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/threadproc/win32/proc.c b/threadproc/win32/proc.c
@@ -603,6 +603,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
                     || strcasecmp(progname + i - 4, ".cmd") == 0))
         {
             const char *argv0;
+            char *shellcmd;
 
             if (has_space(progname)) {
                 argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);
@@ -611,7 +612,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,
                 argv0 = progname;
             }
 
-            char *shellcmd = getenv("COMSPEC");
+            shellcmd = getenv("COMSPEC");
             if (!shellcmd) {
                 if (attr->errfn) {
                     attr->errfn(pool, APR_EINVAL, "COMSPEC envar is not set");

Original file line number	Diff line number	Diff line change
`@@ -603,6 +603,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,`
`603`	`603`	`\|\| strcasecmp(progname + i - 4, ".cmd") == 0))`
`604`	`604`	`{`
`605`	`605`	`const char *argv0;`
	`606`	`+ char *shellcmd;`
`606`	`607`
`607`	`608`	`if (has_space(progname)) {`
`608`	`609`	`argv0 = apr_pstrcat(pool, "\"", progname, "\"", NULL);`
`@@ -611,7 +612,7 @@ APR_DECLARE(apr_status_t) apr_proc_create(apr_proc_t *new,`
`611`	`612`	`argv0 = progname;`
`612`	`613`	`}`
`613`	`614`
`614`		`- char *shellcmd = getenv("COMSPEC");`
	`615`	`+ shellcmd = getenv("COMSPEC");`
`615`	`616`	`if (!shellcmd) {`
`616`	`617`	`if (attr->errfn) {`
`617`	`618`	`attr->errfn(pool, APR_EINVAL, "COMSPEC envar is not set");`