X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fprocess.c;h=b82e951f143ef55ab93709bc7573ffbff39dcb94;hp=0ec98802342f531463c328909fa5520ab3dd4d48;hb=a3cd273751fdcef90a43108a5d2e669877b0bccb;hpb=9bde92ce97d5503ff2d31dcc6f0648902580ec14

diff --git a/src/process.c b/src/process.c
index 0ec9880..b82e951 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.78 2003/12/07 14:29:02 guus Exp $
 */
 
 #include "system.h"
@@ -58,19 +58,6 @@ static void memory_full(int size)
 
 /* Some functions the less gifted operating systems might lack... */
 
-#ifndef HAVE_FCLOSEALL
-static int fcloseall(void)
-{
-	fflush(stdin);
-	fflush(stdout);
-	fflush(stderr);
-	fclose(stdin);
-	fclose(stdout);
-	fclose(stderr);
-	return 0;
-}
-#endif
-
 #ifdef HAVE_MINGW
 extern char *identname;
 extern char *program_name;
@@ -82,9 +69,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 +81,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));
@@ -120,6 +111,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 +156,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)
@@ -244,7 +241,7 @@ bool init_service(void) {
 */
 static bool write_pidfile(void)
 {
-	int pid;
+	pid_t pid;
 
 	cp();
 
@@ -252,16 +249,18 @@ static bool write_pidfile(void)
 
 	if(pid) {
 		if(netname)
-			fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
-					netname, pid);
+			fprintf(stderr, _("A tincd is already running for net `%s' with pid %ld.\n"),
+					netname, (long)pid);
 		else
-			fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
+			fprintf(stderr, _("A tincd is already running with pid %ld.\n"), (long)pid);
 		return false;
 	}
 
 	/* 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;
 }
@@ -273,7 +272,7 @@ static bool write_pidfile(void)
 bool kill_other(int signal)
 {
 #ifndef HAVE_MINGW
-	int pid;
+	pid_t pid;
 
 	cp();
 
@@ -338,8 +337,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());
@@ -359,22 +360,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 +390,7 @@ bool execute_script(const char *name, char **envp)
 		putenv(*envp++);
 #endif
 
+	scriptname[len - 1] = '\"';
 	status = system(scriptname);
 
 	free(scriptname);
@@ -423,13 +431,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)