diff options
| author | Dan Gohman <gohman@apple.com> | 2010-10-29 17:20:42 +0000 |
|---|---|---|
| committer | Dan Gohman <gohman@apple.com> | 2010-10-29 17:20:42 +0000 |
| commit | 5bc07d2bce68708893c65b42a317b4e3c24570d0 (patch) | |
| tree | d7018d23c899c960c13ebb2b0b7ae28d6760b417 /llvm/lib/System/Unix/Program.inc | |
| parent | e1db7f200588568c2002d3e53d32f760e0c100f5 (diff) | |
| download | bcm5719-llvm-5bc07d2bce68708893c65b42a317b4e3c24570d0.tar.gz bcm5719-llvm-5bc07d2bce68708893c65b42a317b4e3c24570d0.zip | |
Check if ErrMsg is null. This fixes the "not" command.
llvm-svn: 117666
Diffstat (limited to 'llvm/lib/System/Unix/Program.inc')
| -rw-r--r-- | llvm/lib/System/Unix/Program.inc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/llvm/lib/System/Unix/Program.inc b/llvm/lib/System/Unix/Program.inc index b92d080bab4..86d9b2a1d9a 100644 --- a/llvm/lib/System/Unix/Program.inc +++ b/llvm/lib/System/Unix/Program.inc @@ -359,24 +359,29 @@ Program::Wait(const sys::Path &path, result = 126; #endif if (result == 127) { - *ErrMsg = llvm::sys::StrError(ENOENT); + if (ErrMsg) + *ErrMsg = llvm::sys::StrError(ENOENT); return -1; } if (result == 126) { - *ErrMsg = "Program could not be executed"; + if (ErrMsg) + *ErrMsg = "Program could not be executed"; return -1; } } else if (WIFSIGNALED(status)) { - *ErrMsg = strsignal(WTERMSIG(status)); + if (ErrMsg) { + *ErrMsg = strsignal(WTERMSIG(status)); #ifdef WCOREDUMP - if (WCOREDUMP(status)) - *ErrMsg += " (core dumped)"; + if (WCOREDUMP(status)) + *ErrMsg += " (core dumped)"; #endif + } return -1; } return result; #else - *ErrMsg = "Program::Wait is not implemented on this platform yet!"; + if (ErrMsg) + *ErrMsg = "Program::Wait is not implemented on this platform yet!"; return -1; #endif } |
