X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=a5abc9364a559b5fee5bb19ed1c264765967da86;hp=3c7164be94f27051159b83cdc747314e2594df91;hb=5900c07fab39d2833ea66429ad652ca49a91a508;hpb=070aee3be16b8d8078b049c5bb43dce7b18123df diff --git a/src/process.c b/src/process.c index 3c7164be..a5abc936 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.64 2003/08/08 12:55:05 guus Exp $ + $Id: process.c,v 1.1.2.76 2003/10/06 16:13:08 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,8 +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) { @@ -92,14 +81,25 @@ 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)); + + if(space) + strncat(command, "\"", sizeof(command)); + strncat(command, *argp, sizeof(command)); + + if(space) + strncat(command, "\"", sizeof(command)); } service = CreateService(manager, identname, identname, @@ -111,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)) @@ -154,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) @@ -235,7 +241,7 @@ bool init_service(void) { */ static bool write_pidfile(void) { - int pid; + pid_t pid; cp(); @@ -243,10 +249,10 @@ 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; } @@ -264,7 +270,7 @@ static bool write_pidfile(void) bool kill_other(int signal) { #ifndef HAVE_MINGW - int pid; + pid_t pid; cp(); @@ -347,106 +353,69 @@ 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 - pid_t pid; - int status; +#ifdef HAVE_SYSTEM + 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; - pid = fork(); + 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; - } +#ifdef HAVE_PUTENV + /* Set environment */ + + while(*envp) + putenv(*envp++); +#endif - 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); + scriptname[len - 1] = '\"'; + status = system(scriptname); + + free(scriptname); + + /* Unset environment? */ + +#ifdef WEXITSTATUS + if(status != -1) { + if(WIFEXITED(status)) { /* Child exited by itself */ + if(WEXITSTATUS(status)) { + logger(LOG_ERR, _("Script %s exited with non-zero status %d"), + 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, _("Script %s was killed by signal %d (%s)"), + name, WTERMSIG(status), strsignal(WTERMSIG(status))); + return false; + } else { /* Something strange happened */ + logger(LOG_ERR, _("Script %s terminated abnormally"), 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 +#endif + return true; }