X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=d1bebcd725c05503d9858054c683dab75da757ac;hp=d81fdd693608d9f11b5b9fe465ada80a7c55fef4;hb=570e7e9c615388cfba263c7a7c66cbc3d092d6e7;hpb=96f5d98fc299a53fcdad304a56eb3a77a2c229e7

diff --git a/src/process.c b/src/process.c
index d81fdd69..d1bebcd7 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.68 2003/08/08 19:56:11 guus Exp $
+    $Id: process.c,v 1.1.2.74 2003/08/22 15:05:01 guus Exp $
 */
 
 #include "system.h"
@@ -82,9 +82,10 @@ static SERVICE_STATUS status = {0};
 static SERVICE_STATUS_HANDLE statushandle = 0;
 
 bool install_service(void) {
-	char command[4096] = "";
+	char command[4096] = "\"";
 	char **argp;
 	bool space;
+	SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
 
 	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 	if(!manager) {
@@ -93,11 +94,14 @@ bool install_service(void) {
 	}
 
 	if(!strchr(program_name, '\\')) {
-		GetCurrentDirectory(sizeof(command), command);
+		GetCurrentDirectory(sizeof(command) - 1, command + 1);
 		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));
@@ -111,6 +115,8 @@ bool install_service(void) {
 			strncat(command, "\"", sizeof(command));
 	}
 
+	logger(LOG_DEBUG, "Command: '%s'", command);
+
 	service = CreateService(manager, identname, identname,
 			SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
 			command, "NDIS", NULL, NULL, NULL, NULL);
@@ -120,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))
@@ -163,24 +171,28 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	switch(request) {
 		case SERVICE_CONTROL_STOP:
 			logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
-			running = false;
 			break;
 		case SERVICE_CONTROL_SHUTDOWN:
 			logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
-			running = false;
 			break;
 		default:
 			logger(LOG_WARNING, _("Got unexpected request %d"), request);
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
-	if(!running) {
+	if(running) {
+		running = false;
 		status.dwWaitHint = 30000; 
 		status.dwCurrentState = SERVICE_STOP_PENDING; 
 		SetServiceStatus(statushandle, &status);
+		return NO_ERROR;
+	} else {
+		status.dwWaitHint = 0; 
+		status.dwCurrentState = SERVICE_STOPPED; 
+		SetServiceStatus(statushandle, &status);
+		exit(1);
 	}
 
-	return NO_ERROR;
 }
 
 VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
@@ -359,23 +371,28 @@ 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);
-#endif
 
 #ifdef HAVE_PUTENV
 	/* Set environment */
@@ -384,6 +401,7 @@ bool execute_script(const char *name, char **envp)
 		putenv(*envp++);
 #endif
 
+	scriptname[len - 1] = '\"';
 	status = system(scriptname);
 
 	free(scriptname);
@@ -394,22 +412,20 @@ bool execute_script(const char *name, char **envp)
 	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