Keep up with lib/System changes

[oota-llvm.git] / lib / System / Win32 / Program.inc

diff --git a/lib/System/Win32/Program.inc b/lib/System/Win32/Program.inc
index ddc939620eafdde1c6b507d23204d174812c2beb..2d3580d3db35715bd9f6cd3fe8d4bb110882bed9 100644 (file)
--- a/lib/System/Win32/Program.inc
+++ b/lib/System/Win32/Program.inc
@@ -69,9 +69,12 @@ Program::FindProgramByName(const std::string& progName) {
 //
 int 
 Program::ExecuteAndWait(const Path& path, 
-                        const std::vector<std::string>& args) {
+                        const char** args,
+                        const char** envp,
+                        const Path** redirects,
+                        unsigned secondsToWait) {
   if (!path.executable())
-    throw path.get() + " is not executable"; 
+    throw path.toString() + " is not executable"; 
 
   // Windows wants a command line, not an array of args, to pass to the new
   // process.  We have to concatenate them all, while quoting the args that
@@ -83,9 +86,9 @@ Program::ExecuteAndWait(const Path& path,
   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;
   }
 
@@ -102,13 +105,14 @@ Program::ExecuteAndWait(const Path& path,
     *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++ = ' ';
@@ -121,17 +125,30 @@ Program::ExecuteAndWait(const Path& path,
   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));
 
-  if (!CreateProcess(path.get().c_str(), command, NULL, NULL, FALSE, 0,
-                     NULL, NULL, &si, &pi))
+  if (!CreateProcess(path.c_str(), command, NULL, NULL, FALSE, 0,
+                     envp, NULL, &si, &pi))
   {
-    ThrowError(std::string("Couldn't execute program '") + path.get() + "'");
+    ThrowError(std::string("Couldn't execute program '") + 
+               path.toString() + "'");
   }
 
   // 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;
@@ -142,7 +159,8 @@ Program::ExecuteAndWait(const Path& path,
   CloseHandle(pi.hThread);
 
   if (!rc)
-    ThrowError(std::string("Failed getting status for program '") + path.get() + "'");
+    ThrowError(std::string("Failed getting status for program '") + 
+               path.toString() + "'");
 
   return status;
 }