X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=28bba02d6013d6a480eb1e4ea4b24f5728e83e8f;hp=9194bedf73cbfd0b8701ee9233078b862c41268f;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=6411e0d8bda8abc2cef87ca852255502f9bb03d0 diff --git a/src/process.c b/src/process.c index 9194bedf..28bba02d 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999-2004 Ivo Timmermans , - 2000-2004 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2007 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 @@ -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; @@ -368,9 +371,9 @@ bool execute_script(const char *name, char **envp) 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; @@ -379,8 +382,10 @@ 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);