X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=35296f041b8a18f1b37f7599ee000d57b2a6b2a7;hp=0ec98802342f531463c328909fa5520ab3dd4d48;hb=5ac4179df66747a7013a10d576c23531d2b4fc58;hpb=9bde92ce97d5503ff2d31dcc6f0648902580ec14

diff --git a/src/process.c b/src/process.c
index 0ec98802..35296f04 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.69 2003/08/08 22:11:54 guus Exp $
+    $Id: process.c,v 1.1.2.73 2003/08/17 12:05:08 guus Exp $
 */
 
 #include "system.h"
@@ -85,6 +85,7 @@ 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) {
@@ -92,12 +93,17 @@ 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));
@@ -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,22 +371,28 @@ bool detach(void)
 bool execute_script(const char *name, char **envp)
 {
 #ifdef HAVE_SYSTEM
-	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 */
@@ -383,6 +401,7 @@ bool execute_script(const char *name, char **envp)
 		putenv(*envp++);
 #endif
 
+	scriptname[len - 1] = '\"';
 	status = system(scriptname);
 
 	free(scriptname);