char flags[CMD_LENGTH];\r
char dir[MAX_PATH];\r
bool stopping;\r
+bool allow_restart;\r
unsigned long throttle_delay;\r
+unsigned long stop_method;\r
HANDLE throttle_timer;\r
LARGE_INTEGER throttle_duetime;\r
FILETIME creation_time;\r
print_message(stderr, NSSM_MESSAGE_PATH_TOO_LONG, NSSM);\r
return 3;\r
}\r
- if (_snprintf(command, sizeof(command), "\"%s\"", path) < 0) {\r
+ if (_snprintf_s(command, sizeof(command), _TRUNCATE, "\"%s\"", path) < 0) {\r
print_message(stderr, NSSM_MESSAGE_OUT_OF_MEMORY_FOR_IMAGEPATH);\r
return 4;\r
}\r
\r
/* Service initialisation */\r
void WINAPI service_main(unsigned long argc, char **argv) {\r
- if (_snprintf(service_name, sizeof(service_name), "%s", argv[0]) < 0) {\r
+ if (_snprintf_s(service_name, sizeof(service_name), _TRUNCATE, "%s", argv[0]) < 0) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "service_name", "service_main()", 0);\r
return;\r
}\r
int ret = start_service();\r
if (ret) {\r
char code[16];\r
- _snprintf(code, sizeof(code), "%d", ret);\r
+ _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", ret);\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);\r
return ret;\r
}\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);\r
return;\r
}\r
- if (_snprintf(text, 11, "0x%08x", control) < 0) {\r
+ if (_snprintf_s(text, 11, _TRUNCATE, "0x%08x", control) < 0) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "control code", "log_service_control", 0);\r
HeapFree(GetProcessHeap(), 0, text);\r
return;\r
/* Start the service */\r
int start_service() {\r
stopping = false;\r
+ allow_restart = true;\r
\r
if (process_handle) return 0;\r
\r
\r
/* Get startup parameters */\r
char *env = 0;\r
- int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay);\r
+ int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir), &env, &throttle_delay, &stop_method, &si);\r
if (ret) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, service_name, 0);\r
return stop_service(2, true, true);\r
\r
/* Launch executable with arguments */\r
char cmd[CMD_LENGTH];\r
- if (_snprintf(cmd, sizeof(cmd), "\"%s\" %s", exe, flags) < 0) {\r
+ if (_snprintf_s(cmd, sizeof(cmd), _TRUNCATE, "\"%s\" %s", exe, flags) < 0) {\r
log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "command line", "start_service", 0);\r
+ close_output_handles(&si);\r
return stop_service(2, true, true);\r
}\r
\r
throttle_restart();\r
\r
- if (! CreateProcess(0, cmd, 0, 0, false, 0, env, dir, &si, &pi)) {\r
+ bool inherit_handles = false;\r
+ if (si.dwFlags & STARTF_USESTDHANDLES) inherit_handles = true;\r
+ if (! CreateProcess(0, cmd, 0, 0, inherit_handles, 0, env, dir, &si, &pi)) {\r
unsigned long error = GetLastError();\r
if (error == ERROR_INVALID_PARAMETER && env) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED_INVALID_ENVIRONMENT, service_name, exe, NSSM_REG_ENV, 0);\r
else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEPROCESS_FAILED, service_name, exe, error_string(error), 0);\r
+ close_output_handles(&si);\r
return stop_service(3, true, true);\r
}\r
process_handle = pi.hProcess;\r
\r
if (get_process_creation_time(process_handle, &creation_time)) ZeroMemory(&creation_time, sizeof(creation_time));\r
\r
- /* Signal successful start */\r
- service_status.dwCurrentState = SERVICE_RUNNING;\r
- SetServiceStatus(service_handle, &service_status);\r
+ close_output_handles(&si);\r
\r
/* Wait for a clean startup. */\r
if (WaitForSingleObject(process_handle, throttle_delay) == WAIT_TIMEOUT) throttle = 0;\r
\r
+ /* Signal successful start */\r
+ service_status.dwCurrentState = SERVICE_RUNNING;\r
+ SetServiceStatus(service_handle, &service_status);\r
+\r
return 0;\r
}\r
\r
/* Stop the service */\r
int stop_service(unsigned long exitcode, bool graceful, bool default_action) {\r
+ allow_restart = false;\r
+ if (wait_handle) UnregisterWait(wait_handle);\r
+\r
if (default_action && ! exitcode && ! graceful) {\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_GRACEFUL_SUICIDE, service_name, exe, exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_UNCLEAN], exit_action_strings[NSSM_EXIT_REALLY] ,0);\r
graceful = true;\r
if (pid) {\r
/* Shut down service */\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_TERMINATEPROCESS, service_name, exe, 0);\r
- kill_process(service_name, process_handle, pid, 0);\r
+ kill_process(service_name, stop_method, process_handle, pid, 0);\r
}\r
else log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_PROCESS_ALREADY_STOPPED, service_name, exe, 0);\r
\r
tree. See below for the possible values of the why argument.\r
*/\r
if (! why) {\r
- _snprintf(code, sizeof(code), "%d", exitcode);\r
+ _snprintf_s(code, sizeof(code), _TRUNCATE, "%d", exitcode);\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_ENDED_SERVICE, exe, service_name, code, 0);\r
}\r
\r
/* Clean up. */\r
- kill_process_tree(service_name, pid, exitcode, pid, &creation_time, &exit_time);\r
+ kill_process_tree(service_name, stop_method, pid, exitcode, pid, &creation_time, &exit_time);\r
\r
/*\r
The why argument is true if our wait timed out or false otherwise.\r
this is a controlled shutdown, and don't take any restart action.\r
*/\r
if (why) return;\r
+ if (! allow_restart) return;\r
\r
/* What action should we take? */\r
int action = NSSM_EXIT_RESTART;\r
/* Fake a crash so pre-Vista service managers will run recovery actions. */\r
case NSSM_EXIT_UNCLEAN:\r
log_event(EVENTLOG_INFORMATION_TYPE, NSSM_EVENT_EXIT_UNCLEAN, service_name, code, exit_action_strings[action], 0);\r
- exit(stop_service(exitcode, false, default_action));\r
+ stop_service(exitcode, false, default_action);\r
+ free_imports();\r
+ exit(exitcode);\r
break;\r
}\r
}\r
if (throttle > 7) throttle = 8;\r
\r
char threshold[8], milliseconds[8];\r
- _snprintf(threshold, sizeof(threshold), "%d", throttle_delay);\r
- _snprintf(milliseconds, sizeof(milliseconds), "%d", ms);\r
+ _snprintf_s(threshold, sizeof(threshold), _TRUNCATE, "%d", throttle_delay);\r
+ _snprintf_s(milliseconds, sizeof(milliseconds), _TRUNCATE, "%d", ms);\r
log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_THROTTLED, service_name, threshold, milliseconds, 0);\r
\r
if (throttle_timer) {\r