X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=1a8592d3bed8bf8a828269acc605203e91c17e1a;hp=c989532e26be0f14888e298354e0a88571cdb6fc;hb=7eed829d288d0fdec2f31709a18ec420e489c2e4;hpb=863349638beb1eaab09e2a3d537c20a7913aef30

diff --git a/src/process.c b/src/process.c
index c989532e..1a8592d3 100644
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.65 2003/08/08 14:48:33 guus Exp $
+    $Id: process.c,v 1.1.2.70 2003/08/08 22:45:46 guus Exp $
 */
 
 #include "system.h"
@@ -84,6 +84,7 @@ static SERVICE_STATUS_HANDLE statushandle = 0;
 bool install_service(void) {
 	char command[4096] = "";
 	char **argp;
+	bool space;
 
 	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 	if(!manager) {
@@ -98,8 +99,16 @@ bool install_service(void) {
 
 	strncat(command, program_name, sizeof(command));
 	for(argp = g_argv + 1; *argp; argp++) {
+		space = strchr(*argp, ' ');
 		strncat(command, " ", sizeof(command));
+		
+		if(space)
+			strncat(command, "\"", sizeof(command));
+		
 		strncat(command, *argp, sizeof(command));
+
+		if(space)
+			strncat(command, "\"", sizeof(command));
 	}
 
 	service = CreateService(manager, identname, identname,
@@ -350,13 +359,13 @@ bool detach(void)
 bool execute_script(const char *name, char **envp)
 {
 #ifdef HAVE_SYSTEM
-	pid_t pid;
 	int status;
 	struct stat s;
 	char *scriptname;
 
 	cp();
 
+#ifndef HAVE_MINGW
 	asprintf(&scriptname, "%s/%s", confbase, name);
 
 	/* First check if there is a script */
@@ -364,40 +373,46 @@ bool execute_script(const char *name, char **envp)
 	if(stat(scriptname, &s))
 		return true;
 
+	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+	free(scriptname);
+#endif
+
+#ifdef HAVE_PUTENV
 	/* Set environment */
 	
 	while(*envp)
 		putenv(*envp++);
+#endif
 
-	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
-
+	asprintf(&scriptname, "\"%s/%s\"", confbase, name);
 	status = system(scriptname);
 
 	free(scriptname);
 
 	/* Unset environment? */
 
+#ifdef WEXITSTATUS
 	if(status != -1) {
 		if(WIFEXITED(status)) {	/* Child exited by itself */
 			if(WEXITSTATUS(status)) {
-				logger(LOG_ERR, _("Process %d (%s) exited with non-zero status %d"),
-					   pid, name, WEXITSTATUS(status));
+				logger(LOG_ERR, _("Script %s exited with non-zero status %d"),
+					   name, WEXITSTATUS(status));
 				return false;
 			}
 		} else if(WIFSIGNALED(status)) {	/* Child was killed by a signal */
-			logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
+			logger(LOG_ERR, _("Script %s was killed by signal %d (%s)"),
 				   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
 			return false;
 		} else {			/* Something strange happened */
-			logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
-				   name);
+			logger(LOG_ERR, _("Script %s terminated abnormally"), name);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "system",
-			   strerror(errno));
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
 		return false;
 	}
+#endif
 #endif
 	return true;
 }