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.65 2003/08/08 14:48:33 guus Exp $
+ $Id: process.c,v 1.1.2.73 2003/08/17 12:05:08 guus Exp $
*/
#include "system.h"
bool install_service(void) {
char command[4096] = "";
char **argp;
+ bool space;
+ SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
return false;
}
+ strncat(command, "\"", sizeof(command));
+
if(!strchr(program_name, '\\')) {
GetCurrentDirectory(sizeof(command), command);
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,
return false;
}
+ ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
logger(LOG_INFO, _("%s service installed"), identname);
if(!StartService(service, 0, NULL))
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
- pid_t pid;
- 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);
+
+#ifdef HAVE_PUTENV
/* Set environment */
while(*envp)
putenv(*envp++);
+#endif
- ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), 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, _("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
#endif
return true;
}