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.71 2003/08/10 13:35:05 guus Exp $
+ $Id: process.c,v 1.1.2.75 2003/08/22 15:07:57 guus Exp $
*/
#include "system.h"
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"};
}
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));
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)
bool execute_script(const char *name, char **envp)
{
#ifdef HAVE_SYSTEM
- int status;
+ int status, len;
struct stat s;
char *scriptname;
cp();
#ifndef HAVE_MINGW
- asprintf(&scriptname, "%s/%s", confbase, name);
+ 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);
- free(scriptname);
-#endif
-
#ifdef HAVE_PUTENV
/* Set environment */
putenv(*envp++);
#endif
- asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+ scriptname[len - 1] = '\"';
status = system(scriptname);
free(scriptname);