Removed run hack.

Previously we used to attempt to run as a service only when the "run"
argument was given, and printed a usage message if no arguments were
provided.

A more appropriate strategy is to check for StartServiceCtrlDispatcher()
returning ERROR_FAILED_SERVICE_CONTROLLER_CONNECT, as that means the
application is not running in a service context.

As a result we no longer write the undocumented "run" argument to the
registry when installing a service.  Technically this means that we
sacrifice backward compatibility with older versions.

diff --git a/nssm.cpp b/nssm.cpp
index 4203c61..d543c46 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -47,23 +47,20 @@ int check_admin(char *action) {
 }\r
 \r
 int main(int argc, char **argv) {\r
-  /* Require an argument since users may try to run nssm directly */\r
-  if (argc == 1) exit(usage(1));\r
-\r
   /* Elevate */\r
-  if (str_equiv(argv[1], "install") || str_equiv(argv[1], "remove")) {\r
-    if (check_admin(argv[1])) exit(100);\r
-  }\r
+  if (argc > 1) {\r
+    if (str_equiv(argv[1], "install") || str_equiv(argv[1], "remove")) {\r
+      if (check_admin(argv[1])) exit(100);\r
+    }\r
 \r
-  /* Valid commands are install or remove */\r
-  if (str_equiv(argv[1], "install")) {\r
-    exit(pre_install_service(argc - 2, argv + 2));\r
+    /* Valid commands are install or remove */\r
+    if (str_equiv(argv[1], "install")) {\r
+      exit(pre_install_service(argc - 2, argv + 2));\r
+    }\r
+    if (str_equiv(argv[1], "remove")) {\r
+      exit(pre_remove_service(argc - 2, argv + 2));\r
+    }\r
   }\r
-  if (str_equiv(argv[1], "remove")) {\r
-    exit(pre_remove_service(argc - 2, argv + 2));\r
-  }\r
-  /* Undocumented: "run" is used to actually do service stuff */\r
-  if (! str_equiv(argv[1], NSSM_RUN)) exit(usage(2));\r
 \r
   /* Thread local storage for error message buffer */\r
   tls_index = TlsAlloc();\r
@@ -74,10 +71,13 @@ int main(int argc, char **argv) {
   /* Start service magic */\r
   SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };\r
   if (! StartServiceCtrlDispatcher(table)) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(GetLastError()), 0);\r
-    return 100;\r
+    unsigned long error = GetLastError();\r
+    /* User probably ran nssm with no argument */\r
+    if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) exit(usage(1));\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);\r
+    exit(100);\r
   }\r
 \r
   /* And nothing more to do */\r
-  return 0;\r
+  exit(0);\r
 }\r

diff --git a/service.cpp b/service.cpp
index ac329bc..ef4ef51 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -96,13 +96,12 @@ int install_service(char *name, char *exe, char *flags) {
 \r
   /* Construct command */\r
   char command[CMD_LENGTH];\r
-  size_t runlen = strlen(NSSM_RUN);\r
   size_t pathlen = strlen(path);\r
-  if (pathlen + runlen + 2 >= VALUE_LENGTH) {\r
+  if (pathlen + 1 >= VALUE_LENGTH) {\r
     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\"", path) < 0) {\r
     fprintf(stderr, "Out of memory for ImagePath!\n");\r
     return 4;\r
   }\r