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.61 2003/08/02 20:50:38 guus Exp $
+ $Id: process.c,v 1.1.2.66 2003/08/08 17:17:13 guus Exp $
*/
#include "system.h"
bool install_service(void) {
char command[4096] = "";
char **argp;
+ bool space;
manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
if(!manager) {
strncat(command, program_name, 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 ERROR_CALL_NOT_IMPLEMENTED;
}
+ if(!running) {
+ status.dwWaitHint = 30000;
+ status.dwCurrentState = SERVICE_STOP_PENDING;
+ SetServiceStatus(statushandle, &status);
+ }
+
return NO_ERROR;
}
status.dwServiceType = SERVICE_WIN32;
- status.dwCurrentState = SERVICE_RUNNING;
status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
status.dwWin32ExitCode = 0;
status.dwServiceSpecificExitCode = 0;
status.dwCheckPoint = 0;
- status.dwWaitHint = 0;
statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
err = 1;
} else {
+ status.dwWaitHint = 30000;
+ status.dwCurrentState = SERVICE_START_PENDING;
+ SetServiceStatus(statushandle, &status);
+
+ status.dwWaitHint = 0;
+ status.dwCurrentState = SERVICE_RUNNING;
SetServiceStatus(statushandle, &status);
err = main2(argc, argv);
+ status.dwWaitHint = 0;
status.dwCurrentState = SERVICE_STOPPED;
- status.dwWin32ExitCode = err;
-
+ //status.dwWin32ExitCode = err;
SetServiceStatus(statushandle, &status);
}
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
+#ifdef HAVE_SYSTEM
pid_t pid;
int status;
struct stat s;
if(stat(scriptname, &s))
return true;
- pid = fork();
+ /* Set environment */
+
+ while(*envp)
+ putenv(*envp++);
- if(pid < 0) {
- logger(LOG_ERR, _("System call `%s' failed: %s"), "fork",
- strerror(errno));
- return false;
- }
+ ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
- 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);
+ status = system(scriptname);
+
+ free(scriptname);
+
+ /* Unset environment? */
+
+ 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));
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, _("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);
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
+ return true;
}
#ifndef HAVE_MINGW
static RETSIGTYPE sigterm_handler(int a)
{
- logger(LOG_NOTICE, _("Got TERM signal"));
+ logger(LOG_NOTICE, _("Got %s signal"), "TERM");
running = false;
}
static RETSIGTYPE sigquit_handler(int a)
{
- logger(LOG_NOTICE, _("Got QUIT signal"));
+ logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
running = false;
}
static RETSIGTYPE sighup_handler(int a)
{
- logger(LOG_NOTICE, _("Got HUP signal"));
+ logger(LOG_NOTICE, _("Got %s signal"), "HUP");
sighup = true;
}
static RETSIGTYPE sigint_handler(int a)
{
+ logger(LOG_NOTICE, _("Got %s signal"), "INT");
+
if(saved_debug_level != -1) {
logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
saved_debug_level);
static RETSIGTYPE sigalrm_handler(int a)
{
- logger(LOG_NOTICE, _("Got ALRM signal"));
+ logger(LOG_NOTICE, _("Got %s signal"), "ALRM");
sigalrm = true;
}
projects / tinc / blobdiff