X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FProgram.cpp;h=79f7e5fbb7e398534a094c94823854bf69a9db7b;hb=11eb51e23935e22e1cb7b346c45713e8c9169c84;hp=01860b082d62d53461a7f53a3665e5904197b08b;hpb=dc5948d47205fd05184a25251e128db6a47b25c2;p=oota-llvm.git

diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp
index 01860b082d6..79f7e5fbb7e 100644
--- a/lib/Support/Program.cpp
+++ b/lib/Support/Program.cpp
@@ -13,6 +13,7 @@
 
 #include "llvm/Support/Program.h"
 #include "llvm/Config/config.h"
+#include "llvm/Support/system_error.h"
 using namespace llvm;
 using namespace sys;
 
@@ -21,30 +22,30 @@ using namespace sys;
 //===          independent code.
 //===----------------------------------------------------------------------===//
 
-int
-Program::ExecuteAndWait(const Path& path,
-                        const char** args,
-                        const char** envp,
-                        const Path** redirects,
-                        unsigned secondsToWait,
-                        unsigned memoryLimit,
-                        std::string* ErrMsg) {
-  Program prg;
-  if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg))
-    return prg.Wait(path, secondsToWait, ErrMsg);
-  else
-    return -1;
+static bool Execute(void **Data, StringRef Program, const char **args,
+                    const char **env, const StringRef **Redirects,
+                    unsigned memoryLimit, std::string *ErrMsg);
+
+static int Wait(void *&Data, StringRef Program, unsigned secondsToWait,
+                std::string *ErrMsg);
+
+int sys::ExecuteAndWait(StringRef Program, const char **args, const char **envp,
+                        const StringRef **redirects, unsigned secondsToWait,
+                        unsigned memoryLimit, std::string *ErrMsg,
+                        bool *ExecutionFailed) {
+  void *Data = 0;
+  if (Execute(&Data, Program, args, envp, redirects, memoryLimit, ErrMsg)) {
+    if (ExecutionFailed) *ExecutionFailed = false;
+    return Wait(Data, Program, secondsToWait, ErrMsg);
+  }
+  if (ExecutionFailed) *ExecutionFailed = true;
+  return -1;
 }
 
-void
-Program::ExecuteNoWait(const Path& path,
-                       const char** args,
-                       const char** envp,
-                       const Path** redirects,
-                       unsigned memoryLimit,
-                       std::string* ErrMsg) {
-  Program prg;
-  prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg);
+void sys::ExecuteNoWait(StringRef Program, const char **args, const char **envp,
+                        const StringRef **redirects, unsigned memoryLimit,
+                        std::string *ErrMsg) {
+  Execute(/*Data*/ 0, Program, args, envp, redirects, memoryLimit, ErrMsg);
 }
 
 // Include the platform-specific parts of this class.