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

diff --git a/src/process.c b/src/process.c
index 2ec0bcd3..c989532e 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.62 2003/08/03 12:38:18 guus Exp $
+    $Id: process.c,v 1.1.2.65 2003/08/08 14:48:33 guus Exp $
 */
 
 #include "system.h"
@@ -166,6 +166,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	}
 
 	if(!running) {
+		status.dwWaitHint = 30000; 
 		status.dwCurrentState = SERVICE_STOP_PENDING; 
 		SetServiceStatus(statushandle, &status);
 	}
@@ -184,7 +185,6 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
 	status.dwWin32ExitCode = 0; 
 	status.dwServiceSpecificExitCode = 0; 
 	status.dwCheckPoint = 0; 
-	status.dwWaitHint = 0; 
 
 	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); 
 
@@ -192,14 +192,17 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
 		err = 1;
 	} else {
+		status.dwWaitHint = 30000; 
 		status.dwCurrentState = SERVICE_START_PENDING; 
 		SetServiceStatus(statushandle, &status);
 
+		status.dwWaitHint = 0; 
 		status.dwCurrentState = SERVICE_RUNNING;
 		SetServiceStatus(statushandle, &status);
 
 		err = main2(argc, argv);
 
+		status.dwWaitHint = 0;
 		status.dwCurrentState = SERVICE_STOPPED; 
 		//status.dwWin32ExitCode = err; 
 		SetServiceStatus(statushandle, &status);
@@ -344,46 +347,9 @@ bool detach(void)
 	return true;
 }
 
-#ifdef HAVE_FORK
-/*
-  Execute the program name, with sane environment.
-*/
-static void _execute_script(const char *scriptname, char **envp)
-	__attribute__ ((__noreturn__));
-static void _execute_script(const char *scriptname, char **envp)
-{
-	int save_errno;
-
-	cp();
-
-	while(*envp)
-		putenv(*envp++);
-
-	chdir("/");
-
-	closelogger();
-
-	/* Close all file descriptors */
-	fcloseall();
-
-	execl(scriptname, scriptname, NULL);
-	/* No return on success */
-
-	save_errno = errno;
-
-	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
-	logger(LOG_ERR, _("Could not execute `%s': %s"), scriptname,
-		   strerror(save_errno));
-	exit(save_errno);
-}
-#endif
-
-/*
-  Fork and execute the program pointed to by name.
-*/
 bool execute_script(const char *name, char **envp)
 {
-#ifdef HAVE_FORK
+#ifdef HAVE_SYSTEM
 	pid_t pid;
 	int status;
 	struct stat s;
@@ -398,52 +364,42 @@ bool execute_script(const char *name, char **envp)
 	if(stat(scriptname, &s))
 		return true;
 
-	pid = fork();
+	/* Set environment */
+	
+	while(*envp)
+		putenv(*envp++);
+
+	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
 
-	if(pid < 0) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fork",
-			   strerror(errno));
-		return false;
-	}
+	status = system(scriptname);
 
-	if(pid) {
-		ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
-
-		free(scriptname);
-
-		if(waitpid(pid, &status, 0) == pid) {
-			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));
-					return false;
-				} else
-					return true;
-			} else if(WIFSIGNALED(status)) {	/* Child was killed by a signal */
-				logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
-					   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
-				return false;
-			} else {			/* Something strange happened */
-				logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
-					   name);
+	free(scriptname);
+
+	/* Unset environment? */
+
+	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));
 				return false;
 			}
-		} else if (errno != EINTR) {
-			logger(LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
-				   strerror(errno));
+		} else if(WIFSIGNALED(status)) {	/* Child was killed by a signal */
+			logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
+				   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
+			return false;
+		} else {			/* Something strange happened */
+			logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
+				   name);
 			return false;
 		}
-
-		/* Why do we get EINTR? */
-		return true;
+	} else {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "system",
+			   strerror(errno));
+		return false;
 	}
-
-	/* Child here */
-
-	_execute_script(scriptname, envp);
-#else
-	return true;
 #endif
+	return true;
 }
 
 
@@ -454,13 +410,13 @@ bool execute_script(const char *name, char **envp)
 #ifndef HAVE_MINGW
 static RETSIGTYPE sigterm_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got TERM signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "TERM");
 	running = false;
 }
 
 static RETSIGTYPE sigquit_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got QUIT signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
 	running = false;
 }
 
@@ -498,12 +454,14 @@ static RETSIGTYPE fatal_signal_handler(int a)
 
 static RETSIGTYPE sighup_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got HUP signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "HUP");
 	sighup = true;
 }
 
 static RETSIGTYPE sigint_handler(int a)
 {
+	logger(LOG_NOTICE, _("Got %s signal"), "INT");
+
 	if(saved_debug_level != -1) {
 		logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
 			saved_debug_level);
@@ -520,7 +478,7 @@ static RETSIGTYPE sigint_handler(int a)
 
 static RETSIGTYPE sigalrm_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got ALRM signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "ALRM");
 	sigalrm = true;
 }