RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-12-14 15:19:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

For PR797:

Browse Source 
Fix a bug in my last patch that botched file redirection by using explicit
scoping of if statements.

llvm-svn: 29815
This commit is contained in:
Reid Spencer 2006-08-22 15:56:52 +00:00
parent af0512fc8d
commit 74980b5115
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/System/Unix/Program.inc
View File

@ -133,22 +133,27 @@ Program::ExecuteAndWait(const Path& path,
case 0: { case 0: {
// Redirect file descriptors... // Redirect file descriptors...
if (redirects) { if (redirects) {
if (redirects[0]) if (redirects[0]) {
if (redirects[0]->isEmpty()) if (redirects[0]->isEmpty()) {
if (RedirectFD("/dev/null",0,ErrMsg)) { return -1; } if (RedirectFD("/dev/null",0,ErrMsg)) { return -1; }
else } else {
if (RedirectFD(redirects[0]->toString(), 0,ErrMsg)) { return -1; } if (RedirectFD(redirects[0]->toString(), 0,ErrMsg)) { return -1; }
if (redirects[1]) }
if (redirects[1]->isEmpty()) }
if (redirects[1]) {
if (redirects[1]->isEmpty()) {
if (RedirectFD("/dev/null",1,ErrMsg)) { return -1; } if (RedirectFD("/dev/null",1,ErrMsg)) { return -1; }
else } else {
if (RedirectFD(redirects[1]->toString(),1,ErrMsg)) { return -1; } if (RedirectFD(redirects[1]->toString(),1,ErrMsg)) { return -1; }
}
}
if (redirects[1] && redirects[2] && if (redirects[1] && redirects[2] &&
*(redirects[1]) != *(redirects[2])) { *(redirects[1]) != *(redirects[2])) {
if (redirects[2]->isEmpty()) if (redirects[2]->isEmpty()) {
if (RedirectFD("/dev/null",2,ErrMsg)) { return -1; } if (RedirectFD("/dev/null",2,ErrMsg)) { return -1; }
else } else {
if (RedirectFD(redirects[2]->toString(), 2,ErrMsg)) { return -1; } if (RedirectFD(redirects[2]->toString(), 2,ErrMsg)) { return -1; }
}
} else if (-1 == dup2(1,2)) { } else if (-1 == dup2(1,2)) {
MakeErrMsg(ErrMsg, "Can't redirect"); MakeErrMsg(ErrMsg, "Can't redirect");
return -1; return -1;