Removed some legacy stuff.

[nssm.git] / service.cpp

diff --git a/service.cpp b/service.cpp
index a90d508..6292698 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -101,7 +101,7 @@ int install_service(char *name, char *exe, char *flags) {
     fprintf(stderr, "The full path to " NSSM " is too long!\n");\r
     return 3;\r
   }\r
-  if (snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
+  if (_snprintf(command, sizeof(command), "\"%s\" %s", path, NSSM_RUN) < 0) {\r
     fprintf(stderr, "Out of memory for ImagePath!\n");\r
     return 4;\r
   }\r
@@ -198,17 +198,6 @@ void WINAPI service_main(unsigned long argc, char **argv) {
     return;\r
   }\r
 \r
-  /* Get startup parameters */\r
-  int ret = get_parameters(argv[0], exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));\r
-  if (ret) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_PARAMETERS_FAILED, argv[0], 0);\r
-    service_status.dwCurrentState = SERVICE_STOPPED;\r
-    /* An accurate, if not particularly helpful, status */\r
-    service_status.dwWin32ExitCode = ERROR_SERVICE_NOT_ACTIVE;\r
-    SetServiceStatus(service_handle, &service_status);\r
-    return;\r
-  }\r
-\r
   service_status.dwCurrentState = SERVICE_START_PENDING;\r
   service_status.dwWaitHint = NSSM_RESET_THROTTLE_RESTART + NSSM_WAITHINT_MARGIN;\r
   SetServiceStatus(service_handle, &service_status);\r
@@ -246,7 +235,7 @@ int monitor_service() {
   int ret = start_service();\r
   if (ret) {\r
     char code[16];\r
-    snprintf(code, sizeof(code), "%d", ret);\r
+    _snprintf(code, sizeof(code), "%d", ret);\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_START_SERVICE_FAILED, exe, service_name, ret, 0);\r
     return ret;\r
   }\r
@@ -304,6 +293,13 @@ int start_service() {
   PROCESS_INFORMATION pi;\r
   ZeroMemory(&pi, sizeof(pi));\r
 \r
+  /* Get startup parameters */\r
+  int ret = get_parameters(service_name, exe, sizeof(exe), flags, sizeof(flags), dir, sizeof(dir));\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
+\r
   /* Launch executable with arguments */\r
   char cmd[CMD_LENGTH];\r
   if (_snprintf(cmd, sizeof(cmd), "%s %s", exe, flags) < 0) {\r