commit a1b3d3d24cebeaa98fb7e2c2280b8fe4e1476761
author Jeff Cohen <jeffc@jolt-lang.org> Mon Dec 20 03:24:56 2004 +0000
committer Jeff Cohen <jeffc@jolt-lang.org> Mon Dec 20 03:24:56 2004 +0000
tree c4358c44886cb095858a8f73f7c69ffde32cbfa2
parent e1337210475d13ed44eb3c9e4dceaf0781e126f4

Keep up with lib/System changes


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@19057 91177308-0d34-0410-b5e6-96231b3b80d8

lib/System/Win32/Program.cpp

diff --git a/lib/System/Win32/Program.cpp b/lib/System/Win32/Program.cpp
index 92b0243..2d3580d 100644
--- a/lib/System/Win32/Program.cpp
+++ b/lib/System/Win32/Program.cpp
@@ -69,8 +69,10 @@
 //
 int 
 Program::ExecuteAndWait(const Path& path, 
-                        const std::vector<std::string>& args,
-                        const char** envp) {
+                        const char** args,
+                        const char** envp,
+                        const Path** redirects,
+                        unsigned secondsToWait) {
   if (!path.executable())
     throw path.toString() + " is not executable"; 
 
@@ -84,9 +86,9 @@
   if (progname.find(' ') != std::string::npos)
     len += 2;
 
-  for (unsigned i = 0; i < args.size(); i++) {
-    len += args[i].length() + 1;
-    if (args[i].find(' ') != std::string::npos)
+  for (unsigned i = 0; args[i]; i++) {
+    len += strlen(args[i]) + 1;
+    if (strchr(args[i], ' '))
       len += 2;
   }
 
@@ -103,13 +105,14 @@
     *p++ = '"';
   *p++ = ' ';
 
-  for (unsigned i = 0; i < args.size(); i++) {
-    const std::string& arg = args[i];
-    needsQuoting = arg.find(' ') != std::string::npos;
+  for (unsigned i = 0; args[i]; i++) {
+    const char *arg = args[i];
+	size_t len = strlen(arg);
+    needsQuoting = strchr(arg, ' ') != 0;
     if (needsQuoting)
       *p++ = '"';
-    memcpy(p, arg.c_str(), arg.length());
-    p += arg.length();
+    memcpy(p, arg, len);
+    p += len;
     if (needsQuoting)
       *p++ = '"';
     *p++ = ' ';
@@ -122,6 +125,8 @@
   memset(&si, 0, sizeof(si));
   si.cb = sizeof(si);
 
+  // TODO: do replacement of standard input/output/error handles.
+
   PROCESS_INFORMATION pi;
   memset(&pi, 0, sizeof(pi));
 
@@ -133,7 +138,17 @@
   }
 
   // Wait for it to terminate.
-  WaitForSingleObject(pi.hProcess, INFINITE);
+  DWORD millisecondsToWait = INFINITE;
+  if (secondsToWait > 0)
+    millisecondsToWait = secondsToWait * 1000;
+
+  if (WaitForSingleObject(pi.hProcess, millisecondsToWait) == WAIT_TIMEOUT) {
+    if (!TerminateProcess(pi.hProcess, 1)) {
+      ThrowError(std::string("Failed to terminate timed-out program '") + 
+                 path.toString() + "'");
+    }
+    WaitForSingleObject(pi.hProcess, INFINITE);
+  }
   
   // Get its exit status.
   DWORD status;