diff options
Diffstat (limited to 'lib/Support')
| -rw-r--r-- | lib/Support/Program.cpp | 5 | ||||
| -rw-r--r-- | lib/Support/Unix/Program.inc | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/lib/Support/Program.cpp b/lib/Support/Program.cpp index 01860b082d..fa816f68c8 100644 --- a/lib/Support/Program.cpp +++ b/lib/Support/Program.cpp @@ -28,10 +28,11 @@ Program::ExecuteAndWait(const Path& path, const Path** redirects, unsigned secondsToWait, unsigned memoryLimit, - std::string* ErrMsg) { + std::string* ErrMsg, + const char* SignalPrefix) { Program prg; if (prg.Execute(path, args, envp, redirects, memoryLimit, ErrMsg)) - return prg.Wait(path, secondsToWait, ErrMsg); + return prg.Wait(path, secondsToWait, ErrMsg, SignalPrefix); else return -1; } diff --git a/lib/Support/Unix/Program.inc b/lib/Support/Unix/Program.inc index 9f0a9ef052..86f3aa9eac 100644 --- a/lib/Support/Unix/Program.inc +++ b/lib/Support/Unix/Program.inc @@ -298,7 +298,8 @@ Program::Execute(const Path &path, const char **args, const char **envp, int Program::Wait(const sys::Path &path, unsigned secondsToWait, - std::string* ErrMsg) + std::string* ErrMsg, + const char* SignalPrefix) { #ifdef HAVE_SYS_WAIT_H struct sigaction Act, Old; @@ -376,7 +377,9 @@ Program::Wait(const sys::Path &path, } } else if (WIFSIGNALED(status)) { if (ErrMsg) { - *ErrMsg = strsignal(WTERMSIG(status)); + if (SignalPrefix) + *ErrMsg = SignalPrefix; + *ErrMsg += strsignal(WTERMSIG(status)); #ifdef WCOREDUMP if (WCOREDUMP(status)) *ErrMsg += " (core dumped)"; |