X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=inline;f=source%2Fcore%2Fwindows%2Fprocess.cpp;h=829365088115289bcdedc0ebc315911f3bf3175c;hb=9b38e20254913629a0db40e8eb8e1c42e1728e41;hp=7b1efd693aff45fce41594914b4d16dc2264de70;hpb=ea60f3548d4769c356b796cb27cd690cdfe4b6d9;p=libs%2Fcore.git

diff --git a/source/core/windows/process.cpp b/source/core/windows/process.cpp
index 7b1efd6..8293650 100644
--- a/source/core/windows/process.cpp
+++ b/source/core/windows/process.cpp
@@ -1,6 +1,7 @@
 #include <windows.h>
 #include <msp/core/systemerror.h>
 #include <msp/io/handle_private.h>
+#include <msp/strings/utils.h>
 #include "process.h"
 #include "process_private.h"
 
@@ -13,19 +14,19 @@ string quote_argument(const string &arg)
 	string result;
 	bool need_quotes = false;
 	bool backslash = false;
-	for(string::const_iterator i=arg.begin(); i!=arg.end(); ++i)
+	for(char c: arg)
 	{
-		if(*i=='\\')
+		if(c=='\\')
 			backslash = true;
-		else if(*i=='"')
+		else if(c=='"')
 		{
 			if(backslash)
 				result += '\\';
 			result += '\\';
 		}
-		else if(*i==' ')
+		else if(c==' ')
 			need_quotes = true;
-		result += *i;
+		result += c;
 	}
 
 	if(need_quotes)
@@ -55,11 +56,8 @@ void Process::platform_get_self_info(Private &priv)
 void Process::execute(const string &command, bool path_search, const Arguments &args)
 {
 	string cmdline = quote_argument(command);
-	for(Arguments::const_iterator i=args.begin(); i!=args.end(); ++i)
-	{
-		cmdline += ' ';
-		cmdline += quote_argument(*i);
-	}
+	for(const string &a: args)
+		append(cmdline, " ", quote_argument(a));
 
 	STARTUPINFO startup;
 	startup.cb = sizeof(STARTUPINFO);
@@ -82,9 +80,15 @@ void Process::execute(const string &command, bool path_search, const Arguments &
 	}
 	const char *cmdptr = (path_search ? 0 : command.c_str());
 	const char *wd = (work_dir.empty() ? 0 : work_dir.c_str());
-	if(!CreateProcess(cmdptr, const_cast<char *>(cmdline.c_str()), 0, 0, false, 0, 0, wd, &startup, &priv->info))
+	if(!CreateProcess(cmdptr, const_cast<char *>(cmdline.c_str()), 0, 0, true, 0, 0, wd, &startup, &priv->info))
 		throw system_error("CreateProcess");
-	// XXX Should we close the duplicated handles?  What if CreateProcess fails?
+
+	if(redirect)
+	{
+		CloseHandle(startup.hStdInput);
+		CloseHandle(startup.hStdOutput);
+		CloseHandle(startup.hStdError);
+	}
 
 	running = true;
 
@@ -105,6 +109,9 @@ bool Process::wait(bool block)
 	{
 		running = false;
 		finished = true;
+		DWORD ec;
+		if(GetExitCodeProcess(priv->info.hProcess, &ec))
+			exit_code = ec;
 	}
 
 	return finished;