X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FSupport%2FProgram.cpp;h=79f7e5fbb7e398534a094c94823854bf69a9db7b;hb=11eb51e23935e22e1cb7b346c45713e8c9169c84;hp=6e04a1cd536ddaedc272b6e9e9e8b5feb1e3876d;hpb=0db5f0f07e6411fa25aefd464648ec8fc335a2d7;p=oota-llvm.git diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp index 6e04a1cd536..79f7e5fbb7e 100644 --- a/lib/Support/Program.cpp +++ b/lib/Support/Program.cpp @@ -22,31 +22,30 @@ using namespace sys; //=== independent code. //===----------------------------------------------------------------------===// -static bool Execute(void *&Data, const Path &path, const char **args, - const char **env, const sys::Path **redirects, +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, const Path &path, unsigned secondsToWait, +static int Wait(void *&Data, StringRef Program, unsigned secondsToWait, std::string *ErrMsg); -int sys::ExecuteAndWait(const Path &path, const char **args, const char **envp, - const Path **redirects, unsigned secondsToWait, +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, path, args, envp, redirects, memoryLimit, ErrMsg)) { + if (Execute(&Data, Program, args, envp, redirects, memoryLimit, ErrMsg)) { if (ExecutionFailed) *ExecutionFailed = false; - return Wait(Data, path, secondsToWait, ErrMsg); + return Wait(Data, Program, secondsToWait, ErrMsg); } if (ExecutionFailed) *ExecutionFailed = true; return -1; } -void sys::ExecuteNoWait(const Path &path, const char **args, const char **envp, - const Path **redirects, unsigned memoryLimit, +void sys::ExecuteNoWait(StringRef Program, const char **args, const char **envp, + const StringRef **redirects, unsigned memoryLimit, std::string *ErrMsg) { - void *Data = 0; - Execute(Data, path, args, envp, redirects, memoryLimit, ErrMsg); + Execute(/*Data*/ 0, Program, args, envp, redirects, memoryLimit, ErrMsg); } // Include the platform-specific parts of this class.