Changeset 1278 in kBuild for trunk/src

Timestamp:

Nov 29, 2007 11:46:50 PM (17 years ago)

Author:

bird

Message:

execvp screws up wrt to anyone waiting on us on window.

File:

• trunk/src/kmk_redirect/kmk_redirect.c (modified) (10 diffs)

trunk/src/kmk_redirect/kmk_redirect.c

@@ -52 +52 @@
             "\n"
             "The rwa+tb is like for fopen, if not specified it defaults to w+.\n"
-            "The <fd> is either a number or an alias for the standard handles;\n" 
+            "The <fd> is either a number or an alias for the standard handles;\n"
             "i - stdin, o - stdout, e - stderr.\n"
             ,
@@ -60 +60 @@
 
 
-int main(int argc, char **argv, char **envp)
+int main(int argc, char **argv)
 {
     int i;
+#if defined(_MSC_VER)
+    intptr_t rc;
+#endif
     FILE *pStdErr = stderr;
     FILE *pStdOut = stdout;
@@ -112 +115 @@
             }
 
-            /* 
+            /*
              * Parse a file descriptor argument.
              */
@@ -174 +177 @@
 #ifdef O_TEXT
                     fOpen |= O_TEXT;
-#endif 
+#endif
                     psz++;
                     break;
@@ -193 +196 @@
                     psz++;
                     break;
-                        
+
                 case 'e':
                     fd = 2;
                     psz++;
                     break;
-    
+
                 case '0':
                     if (!psz[1])
@@ -220 +223 @@
                         fprintf(pStdErr, "%s: error: failed to convert '%s' to a number\n", argv[0], argv[i]);
                         return 1;
-                        
+
                     }
                     if (fd < 0)
@@ -258 +261 @@
             if (fd == fileno(pStdErr))
             {
-                /* 
+                /*
                  * Move stderr to a new location, making it close on exec.
                  * If pStdOut has already teamed up with pStdErr, update it too.
@@ -270 +273 @@
                 }
 #ifdef _MSC_VER
-                /** @todo figure out how to make the handle close-on-exec. We'll simply close it for now. 
+                /** @todo figure out how to make the handle close-on-exec. We'll simply close it for now.
                  * SetHandleInformation + set FNOINHERIT in CRT.
                  */
@@ -279 +282 @@
                     return 1;
                 }
-#endif 
+#endif
 
                 pNew = fdopen(fdOpened, "w");
@@ -335 +338 @@
     }
 
-#if 0/** @todo defined(_MSC_VER)
-    / * 
-     * We'll have to find the '--' in the commandline and pass that 
-     * on to CreateProcess or spawn. Otherwise, the argument qouting 
+#if defined(_MSC_VER)
+    /** @todo
+     * We'll have to find the '--' in the commandline and pass that
+     * on to CreateProcess or spawn. Otherwise, the argument qouting
      * is gonna be messed up.
      */
+    if (fileno(pStdErr) != 2)
+        fclose(pStdErr);
+    rc = _spawnvp(_P_WAIT, argv[i], &argv[i]);
+    if (rc == -1 && fileno(pStdErr) != 2)
+    {
+        fprintf(pStdErr, "%s: error: _spawnvp(_P_WAIT,%s,..) failed: %s\n", argv[0], argv[i], strerror(errno));
+        rc = 1;
+    }
+    return rc;
 #else
-# if defined(_MSC_VER) /* tmp hack. */
-    if (fileno(pStdErr) != 2)
-    {
-        fclose(pStdErr);
-        execv(argv[i], &argv[i]);
-        return 1;
-    }
-# endif
-    execv(argv[i], &argv[i]);
-    fprintf(pStdErr, "%s: error: execv(%s,..) failed: %s\n", argv[0], argv[i], strerror(errno));
-#endif
+    execvp(argv[i], &argv[i]);
     return 1;
+#endif
 }