[llvm] r183934 - Add a version of sys::ExecuteAndWait that takes StringRefs.

[Rafael Espindola]

Author: rafael
Date: Thu Jun 13 15:06:28 2013
New Revision: 183934

URL: http://llvm.org/viewvc/llvm-project?rev=183934&view=rev
Log:
Add a version of sys::ExecuteAndWait that takes StringRefs.

Modified:
    llvm/trunk/include/llvm/Support/Program.h
    llvm/trunk/lib/Support/Program.cpp

Modified: llvm/trunk/include/llvm/Support/Program.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/Program.h?rev=183934&r1=183933&r2=183934&view=diff
==============================================================================
--- llvm/trunk/include/llvm/Support/Program.h (original)
+++ llvm/trunk/include/llvm/Support/Program.h Thu Jun 13 15:06:28 2013
@@ -80,6 +80,11 @@ namespace sys {
       ///< program.
       bool *ExecutionFailed = 0);
 
+  int ExecuteAndWait(StringRef path, const char **args, const char **env = 0,
+                     const StringRef **redirects = 0,
+                     unsigned secondsToWait = 0, unsigned memoryLimit = 0,
+                     std::string *ErrMsg = 0, bool *ExecutionFailed = 0);
+
   /// Similar to ExecuteAndWait, but return immediately.
   void ExecuteNoWait(const Path &path, const char **args, const char **env = 0,
                      const sys::Path **redirects = 0, unsigned memoryLimit = 0,

Modified: llvm/trunk/lib/Support/Program.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Support/Program.cpp?rev=183934&r1=183933&r2=183934&view=diff
==============================================================================
--- llvm/trunk/lib/Support/Program.cpp (original)
+++ llvm/trunk/lib/Support/Program.cpp Thu Jun 13 15:06:28 2013
@@ -29,6 +29,29 @@ static bool Execute(void **Data, const P
 static int Wait(void *&Data, const Path &path, unsigned secondsToWait,
                 std::string *ErrMsg);
 
+int sys::ExecuteAndWait(StringRef path, const char **args, const char **env,
+                        const StringRef **redirects, unsigned secondsToWait,
+                        unsigned memoryLimit, std::string *ErrMsg,
+                        bool *ExecutionFailed) {
+  Path P(path);
+  if (!redirects)
+    return ExecuteAndWait(P, args, env, 0, secondsToWait, memoryLimit, ErrMsg,
+                          ExecutionFailed);
+  Path IO[3];
+  const Path *IOP[3];
+  for (int I = 0; I < 3; ++I) {
+    if (redirects[I]) {
+      IO[I] = *redirects[I];
+      IOP[I] = &IO[I];
+    } else {
+      IOP[I] = 0;
+   }
+  }
+
+  return ExecuteAndWait(P, args, env, IOP, secondsToWait, memoryLimit, ErrMsg,
+                        ExecutionFailed);
+}
+
 int sys::ExecuteAndWait(const Path &path, const char **args, const char **envp,
                         const Path **redirects, unsigned secondsToWait,
                         unsigned memoryLimit, std::string *ErrMsg,