6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-15 05:24:01 +00:00
Code Issues Projects Releases Wiki Activity

Add a version of sys::ExecuteAndWait that takes StringRefs.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183934 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2013-06-13 20:06:28 +00:00
parent c06e5cf2e3
commit a29ece1693
2 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/llvm/Support/Program.h
View File

@ -80,6 +80,11 @@ namespace sys {
///< program. ///< program.
bool *ExecutionFailed = 0); 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. /// Similar to ExecuteAndWait, but return immediately.
void ExecuteNoWait(const Path &path, const char **args, const char **env = 0, void ExecuteNoWait(const Path &path, const char **args, const char **env = 0,
const sys::Path **redirects = 0, unsigned memoryLimit = 0, const sys::Path **redirects = 0, unsigned memoryLimit = 0,

23
lib/Support/Program.cpp
View File

@ -29,6 +29,29 @@ static bool Execute(void **Data, const Path &path, const char **args,
static int Wait(void *&Data, const Path &path, unsigned secondsToWait, static int Wait(void *&Data, const Path &path, unsigned secondsToWait,
std::string *ErrMsg); 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, int sys::ExecuteAndWait(const Path &path, const char **args, const char **envp,
const Path **redirects, unsigned secondsToWait, const Path **redirects, unsigned secondsToWait,
unsigned memoryLimit, std::string *ErrMsg, unsigned memoryLimit, std::string *ErrMsg,