X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=28bba02d6013d6a480eb1e4ea4b24f5728e83e8f;hp=a5abc9364a559b5fee5bb19ed1c264765967da86;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=5900c07fab39d2833ea66429ad652ca49a91a508

diff --git a/src/process.c b/src/process.c
index a5abc936..28bba02d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -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.76 2003/10/06 16:13:08 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -81,30 +81,30 @@ bool install_service(void) {
 	}
 
 	if(!strchr(program_name, '\\')) {
-		GetCurrentDirectory(sizeof(command) - 1, command + 1);
-		strncat(command, "\\", sizeof(command));
+		GetCurrentDirectory(sizeof command - 1, command + 1);
+		strncat(command, "\\", sizeof command - strlen(command));
 	}
 
-	strncat(command, program_name, sizeof(command));
+	strncat(command, program_name, sizeof command - strlen(command));
 
-	strncat(command, "\"", sizeof(command));
+	strncat(command, "\"", sizeof command - strlen(command));
 
 	for(argp = g_argv + 1; *argp; argp++) {
 		space = strchr(*argp, ' ');
-		strncat(command, " ", sizeof(command));
+		strncat(command, " ", sizeof command - strlen(command));
 		
 		if(space)
-			strncat(command, "\"", sizeof(command));
+			strncat(command, "\"", sizeof command - strlen(command));
 		
-		strncat(command, *argp, sizeof(command));
+		strncat(command, *argp, sizeof command - strlen(command));
 
 		if(space)
-			strncat(command, "\"", sizeof(command));
+			strncat(command, "\"", sizeof command - strlen(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);
+			command, NULL, NULL, NULL, NULL, NULL);
 	
 	if(!service) {
 		logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
@@ -154,6 +154,9 @@ bool remove_service(void) {
 
 DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	switch(request) {
+		case SERVICE_CONTROL_INTERROGATE:
+			SetServiceStatus(statushandle, &status);
+			return NO_ERROR;
 		case SERVICE_CONTROL_STOP:
 			logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
 			break;
@@ -257,8 +260,10 @@ static bool write_pidfile(void)
 	}
 
 	/* if it's locked, write-protected, or whatever */
-	if(!write_pid(pidfilename))
+	if(!write_pid(pidfilename)) {
+		fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno));
 		return false;
+	}
 
 	return true;
 }
@@ -335,8 +340,10 @@ bool detach(void)
 
 		/* Now UPDATE the pid in the pidfile, because we changed it... */
 
-		if(!write_pid(pidfilename))
+		if(!write_pid(pidfilename)) {
+			fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno));
 			return false;
+		}
 #else
 		if(!statushandle)
 			exit(install_service());
@@ -358,14 +365,15 @@ bool execute_script(const char *name, char **envp)
 #ifdef HAVE_SYSTEM
 	int status, len;
 	struct stat s;
-	char *scriptname;
+	char *scriptname, *p;
+	int i;
 
 	cp();
 
 #ifndef HAVE_MINGW
-	len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+	len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
 #else
-	len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+	len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
 #endif
 	if(len < 0)
 		return false;
@@ -374,16 +382,18 @@ bool execute_script(const char *name, char **envp)
 
 	/* First check if there is a script */
 
-	if(stat(scriptname + 1, &s))
+	if(stat(scriptname + 1, &s)) {
+		free(scriptname);
 		return true;
+	}
 
 	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
 
 #ifdef HAVE_PUTENV
 	/* Set environment */
 	
-	while(*envp)
-		putenv(*envp++);
+	for(i = 0; envp[i]; i++)
+		putenv(envp[i]);
 #endif
 
 	scriptname[len - 1] = '\"';
@@ -391,7 +401,17 @@ bool execute_script(const char *name, char **envp)
 
 	free(scriptname);
 
-	/* Unset environment? */
+	/* Unset environment */
+
+	for(i = 0; envp[i]; i++) {
+		char *e = strchr(envp[i], '=');
+		if(e) {
+			p = alloca(e - envp[i] + 1);
+			strncpy(p, envp[i], e - envp[i]);
+			p[e - envp[i]] = '\0';
+			putenv(p);
+		}
+	}
 
 #ifdef WEXITSTATUS
 	if(status != -1) {
@@ -427,13 +447,19 @@ bool execute_script(const char *name, char **envp)
 static RETSIGTYPE sigterm_handler(int a)
 {
 	logger(LOG_NOTICE, _("Got %s signal"), "TERM");
-	running = false;
+	if(running)
+		running = false;
+	else
+		exit(1);
 }
 
 static RETSIGTYPE sigquit_handler(int a)
 {
 	logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
-	running = false;
+	if(running)
+		running = false;
+	else
+		exit(1);
 }
 
 static RETSIGTYPE fatal_signal_square(int a)