X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Funix%2Fprocess.cpp;h=975fa223520486fd59122ae90e17e322fd4e755a;hb=95a005d09584925e1d865caea57b9352c0770b00;hp=76141b0360a56de7ed150878430f4a6848a26279;hpb=ea60f3548d4769c356b796cb27cd690cdfe4b6d9;p=libs%2Fcore.git

diff --git a/source/core/unix/process.cpp b/source/core/unix/process.cpp
index 76141b0..975fa22 100644
--- a/source/core/unix/process.cpp
+++ b/source/core/unix/process.cpp
@@ -4,6 +4,7 @@
 #include <msp/core/systemerror.h>
 #include <msp/fs/dir.h>
 #include <msp/io/console.h>
+#include "except.h"
 #include "process.h"
 #include "process_private.h"
 
@@ -35,10 +36,11 @@ void Process::execute(const string &command, bool path_search, const Arguments &
 			argv[0] = command.c_str();
 			for(unsigned i=0; i<args.size(); ++i)
 				argv[i+1] = args[i].c_str();
-			argv[args.size()+1] = 0;
+			argv[args.size()+1] = nullptr;
 
 			if(redirect)
 			{
+				// dup2 clears O_CLOEXEC
 				if(cin)
 					IO::cin.redirect(*cin);
 				if(cout)
@@ -69,7 +71,7 @@ void Process::execute(const string &command, bool path_search, const Arguments &
 bool Process::wait(bool block)
 {
 	if(!running)
-		throw logic_error("not running");
+		throw invalid_state("not running");
 
 	int status;
 	int pid = waitpid(priv->info.pid, &status, (block ? 0 : WNOHANG));