summaryrefslogtreecommitdiffstats
path: root/buildtool.cpp
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2008-06-23 16:51:13 +0000
committerishmal <ishmal@users.sourceforge.net>2008-06-23 16:51:13 +0000
commit89d4b98399d01a93a189ee586b36cea5f7d26006 (patch)
treee82badd55ae068182398cc6f658ceba7247edd8d /buildtool.cpp
parentimplement kerning by glyph-name, g1 and g2 attributes (diff)
downloadinkscape-89d4b98399d01a93a189ee586b36cea5f7d26006.tar.gz
inkscape-89d4b98399d01a93a189ee586b36cea5f7d26006.zip
tweak stdout/stderr piping
(bzr r6027)
Diffstat (limited to 'buildtool.cpp')
-rw-r--r--buildtool.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/buildtool.cpp b/buildtool.cpp
index b0570ed32..852e65124 100644
--- a/buildtool.cpp
+++ b/buildtool.cpp
@@ -4115,7 +4115,7 @@ bool MakeBase::executeCommand(const String &command,
args[2] = (char *)command.c_str();
args[3] = NULL;
execv("/bin/sh", args);
- _exit(EXIT_FAILURE);
+ exit(EXIT_FAILURE);
}
String outb;
@@ -4145,20 +4145,20 @@ bool MakeBase::executeCommand(const String &command,
if (FD_ISSET(outRead, &fdset))
{
if (read(outRead, &ch, 1) <= 0)
- outOpen = false;
+ { outOpen = false; }
else if (ch <= 0)
- outOpen = false;
+ { /* outOpen = false; */ }
else
- outb.push_back(ch);
+ { outb.push_back(ch); }
}
if (FD_ISSET(errRead, &fdset))
{
if (read(errRead, &ch, 1) <= 0)
- errOpen = false;
+ { errOpen = false; }
else if (ch <= 0)
- errOpen = false;
+ { /* errOpen = false; */ }
else
- errb.push_back(ch);
+ { errb.push_back(ch); }
}
}