Additional MSVC fixes

[builder.git] / source / externaltask.cpp

diff --git a/source/externaltask.cpp b/source/externaltask.cpp
index e4dfdc2ef9566122042d6ad430595acb1488f6b0..16d1df096dd4a23eee3f60b2e54a8cf289de9884 100644 (file)
--- a/source/externaltask.cpp
+++ b/source/externaltask.cpp
@@ -1,11 +1,9 @@
 #include <cstdlib>
-#include <unistd.h>
-#include <sys/wait.h>
 #include <msp/fs/dir.h>
 #include <msp/io/console.h>
 #include <msp/io/file.h>
 #include <msp/io/print.h>
-#include <msp/time/units.h>
+#include <msp/time/timedelta.h>
 #include "externaltask.h"
 
 using namespace std;
@@ -73,7 +71,11 @@ void ExternalTask::start()
 
        if(stdin_action==IGNORE || stdout_action==IGNORE || stderr_action==IGNORE)
        {
+#ifdef _WIN32
+               devnull = new IO::File("nul", IO::M_RDWR);
+#else
                devnull = new IO::File("/dev/null", IO::M_RDWR);
+#endif
                if(stdin_action==IGNORE)
                        process->redirect_cin(*devnull);
                if(stdout_action==IGNORE)
@@ -128,9 +130,9 @@ Task::Status ExternalTask::wait()
 
 Task::Status ExternalTask::do_wait(bool block)
 {
-       if(process)
+       while(process)
        {
-               if(process->wait(block))
+               if(process->wait(block && !capture_pipe))
                {
                        exit_code = process->get_exit_code();
                        delete process;
@@ -138,7 +140,7 @@ Task::Status ExternalTask::do_wait(bool block)
                }
 
                // Do this after waiting to avoid a race condition
-               while(capture_pipe && IO::poll(*capture_pipe, IO::P_INPUT, Time::zero))
+               while(capture_pipe && IO::poll(*capture_pipe, IO::P_INPUT, 10*Time::msec))
                {
                        char buf[1024];
                        unsigned len = capture_pipe->read(buf, sizeof(buf));
@@ -149,7 +151,10 @@ Task::Status ExternalTask::do_wait(bool block)
                }
 
                if(process)
-                       return RUNNING;
+               {
+                       if(!block)
+                               return RUNNING;
+               }
                else
                        signal_finished.emit(!exit_code);
        }