X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=src%2Fprocess.c;h=9194bedf73cbfd0b8701ee9233078b862c41268f;hp=43ce5bde73b2948e793735125aa643d68cb45cb7;hb=6411e0d8bda8abc2cef87ca852255502f9bb03d0;hpb=7f05445047c6479b81b7d393543ff73a95ee0dc8 diff --git a/src/process.c b/src/process.c index 43ce5bd..9194bed 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999-2003 Ivo Timmermans , - 2000-2003 Guus Sliepen + Copyright (C) 1999-2004 Ivo Timmermans , + 2000-2004 Guus Sliepen 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.67 2003/08/08 19:43:47 guus Exp $ + $Id$ */ #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,15 +81,23 @@ 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, space?" \"":" ", sizeof(command)); + strncat(command, " ", sizeof(command)); + + if(space) + strncat(command, "\"", sizeof(command)); + strncat(command, *argp, sizeof(command)); + if(space) strncat(command, "\"", sizeof(command)); } @@ -115,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)) @@ -158,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) @@ -239,7 +241,7 @@ bool init_service(void) { */ static bool write_pidfile(void) { - int pid; + pid_t pid; cp(); @@ -247,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; } @@ -268,7 +272,7 @@ static bool write_pidfile(void) bool kill_other(int signal) { #ifndef HAVE_MINGW - int pid; + pid_t pid; cp(); @@ -333,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()); @@ -354,55 +360,72 @@ 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; + char *scriptname, *p; + int i; 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 */ - while(*envp) - putenv(*envp++); + for(i = 0; envp[i]; i++) + putenv(envp[i]); +#endif + scriptname[len - 1] = '\"'; status = system(scriptname); 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) { 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 @@ -419,13 +442,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)