Replace per-file copyright notices with a single file

[builder.git] / source / misc.cpp

diff --git a/source/misc.cpp b/source/misc.cpp
index cf180ce1beada0ab0a4ce2dc23e829fdd3d258a9..f540121442f6777aa4026e73cb803bd576f9f6f4 100644 (file)
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -1,41 +1,34 @@
-/* $Id$
-
-This file is part of builder
-Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#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;
 
-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);
                close(pfd[1]);
-               int devnull=open("/dev/null", O_WRONLY);
+               int devnull = open("/dev/null", O_WRONLY);
                dup2(devnull, 2);
                close(devnull);
 
@@ -43,18 +36,28 @@ string run_command(const StringList &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);