Use mspio for all I/O operations

[builder.git] / source / misc.cpp

diff --git a/source/misc.cpp b/source/misc.cpp
index 30239a48eaed27a4bef5cf8ad8ca4ee80e154e3f..cf97c5506db3526535cfdbbfe3e3a9390224e8e6 100644 (file)
--- a/source/misc.cpp
+++ b/source/misc.cpp
@@ -1,21 +1,20 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+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;
 
-/**
-Runs a command and returns its output as a string.  The exit status of the
-command is lost.
-*/
 string run_command(const StringList &argv)
 {
        int pfd[2];
@@ -35,13 +34,16 @@ string run_command(const StringList &argv)
 
                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]);
@@ -57,6 +59,7 @@ string run_command(const StringList &argv)
                        else
                                result.append(buf, len);
                }
+               close(pfd[0]);
        }
 
        return result;