X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fmisc.cpp;h=f540121442f6777aa4026e73cb803bd576f9f6f4;hb=bd2a50ecb9f582c6e9569ffc9f33d41f10363c5f;hp=0d7a13de81931dcfb2e5b7e82229d32c9711d5a7;hpb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;p=builder.git

diff --git a/source/misc.cpp b/source/misc.cpp
index 0d7a13d..f540121 100644
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -1,55 +1,68 @@
-#include <iostream>
 #include <sys/wait.h>
+#include <fcntl.h>
+#include <cstdlib>
+#include <cstring>
+#include <msp/io/print.h>
 #include "misc.h"
 
 using namespace std;
 using namespace Msp;
 
-/**
-Runs a command and returns its output as a string.  The exit status of the
-command is lost.
-*/
-string run_command(const StringList &argv)
+string run_command(const StringList &argv, int *status)
 {
 	int pfd[2];
 	pipe(pfd);
 
 	string result;
 
-	pid_t pid=fork();
+	pid_t pid = fork();
 	if(pid==0)
 	{
 		char *argv_[argv.size()+1];
 
-		unsigned j=0;
+		unsigned j = 0;
 		for(StringList::const_iterator i=argv.begin(); i!=argv.end(); ++i)
-			argv_[j++]=strdup(i->c_str());
-		argv_[j]=0;
+			argv_[j++] = strdup(i->c_str());
+		argv_[j] = 0;
 
 		close(pfd[0]);
 		dup2(pfd[1], 1);
-		dup2(pfd[1], 2);
+		close(pfd[1]);
+		int devnull = open("/dev/null", O_WRONLY);
+		dup2(devnull, 2);
+		close(devnull);
 
 		execvp(argv_[0], argv_);
 		::exit(1);
 	}
 	else if(pid==-1)
-		cerr<<"Failed to execute "<<argv.front()<<'\n';
+		IO::print(IO::cerr, "Failed to execute %s\n", argv.front());
 	else
 	{
 		close(pfd[1]);
 		while(1)
 		{
 			char buf[1024];
-			int len=read(pfd[0], buf, sizeof(buf));
+			int len = read(pfd[0], buf, sizeof(buf));
 			if(len<=0)
 			{
-				if(waitpid(pid, 0, WNOHANG))
+				int s;
+				if(waitpid(pid, &s, WNOHANG))
+				{
+					if(status)
+					{
+						if(WIFEXITED(s))
+							*status = WEXITSTATUS(s);
+						else
+							*status = -1;
+					}
 					break;
+				}
 			}
 			else
 				result.append(buf, len);
 		}
+		close(pfd[0]);
 	}
 
 	return result;