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

diff --git a/src/process.c b/src/process.c
index c989532e..fd19f4d2 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.72 2003/08/16 12:11:11 guus Exp $
 */
 
 #include "system.h"
@@ -84,6 +84,8 @@ static SERVICE_STATUS_HANDLE statushandle = 0;
 bool install_service(void) {
 	char command[4096] = "";
 	char **argp;
+	bool space;
+	SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
 
 	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 	if(!manager) {
@@ -91,15 +93,28 @@ bool install_service(void) {
 		return false;
 	}
 
+	strncat(command, "\"", sizeof(command));
+
 	if(!strchr(program_name, '\\')) {
 		GetCurrentDirectory(sizeof(command), command);
 		strncat(command, "\\", sizeof(command));
 	}
 
 	strncat(command, program_name, sizeof(command));
+
+	strncat(command, "\"", 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,
@@ -111,6 +126,8 @@ bool install_service(void) {
 		return false;
 	}
 
+	ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
 	logger(LOG_INFO, _("%s service installed"), identname);
 
 	if(!StartService(service, 0, NULL))
@@ -350,54 +367,64 @@ bool detach(void)
 bool execute_script(const char *name, char **envp)
 {
 #ifdef HAVE_SYSTEM
-	pid_t pid;
-	int status;
+	int status, len;
 	struct stat s;
 	char *scriptname;
 
 	cp();
 
-	asprintf(&scriptname, "%s/%s", confbase, name);
+#ifndef HAVE_MINGW
+	len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+#else
+	len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+#endif
+	if(len < 0)
+		return false;
+
+	scriptname[len - 1] = '\0';
 
 	/* First check if there is a script */
 
-	if(stat(scriptname, &s))
+	if(stat(scriptname + 1, &s))
 		return true;
 
+	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+#ifdef HAVE_PUTENV
 	/* Set environment */
 	
 	while(*envp)
 		putenv(*envp++);
+#endif
 
-	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
-
+	scriptname[len - 1] = '\"';
 	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;
 }