X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=1ee38bdb9db12d67c4a60ad753b20a464992cf57;hb=293f2a969fcda19b59436269cba68d748270de3e;hp=7a7311425f7fff20207c8389dec37b5ca03007b9;hpb=fb6318bf814fd7f3445de8c83b7620e1b6b3c197;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 7a73114..1ee38bd 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -14,17 +14,7 @@ int str_equiv(const char *a, const char *b) {
 
 /* How to use me correctly */
 int usage(int ret) {
-  fprintf(stderr, "NSSM: The non-sucking service manager\n");
-  fprintf(stderr, "Version %s, %s\n", NSSM_VERSION, NSSM_DATE);
-  fprintf(stderr, "Usage: nssm <option> [args]\n\n");
-  fprintf(stderr, "To show service installation GUI:\n\n");
-  fprintf(stderr, "        nssm install [<servicename>]\n\n");
-  fprintf(stderr, "To install a service without confirmation:\n\n");
-  fprintf(stderr, "        nssm install <servicename> <app> [<args>]\n\n");
-  fprintf(stderr, "To show service removal GUI:\n\n");
-  fprintf(stderr, "        nssm remove [<servicename>]\n\n");
-  fprintf(stderr, "To remove a service without confirmation:\n\n");
-  fprintf(stderr, "        nssm remove <servicename> confirm\n");
+  print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_DATE);
   return(ret);
 }
 
@@ -45,18 +35,19 @@ int main(int argc, char **argv) {
 
   /* Elevate */
   if (argc > 1) {
-    if (str_equiv(argv[1], "install") || str_equiv(argv[1], "remove")) {
+    /* Valid commands are install or remove */
+    if (str_equiv(argv[1], "install")) {
       if (! is_admin) {
-        fprintf(stderr, "Administrator access is needed to %s a service.\n", argv[1]);
+        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL);
         exit(100);
       }
-    }
-
-    /* Valid commands are install or remove */
-    if (str_equiv(argv[1], "install")) {
       exit(pre_install_service(argc - 2, argv + 2));
     }
     if (str_equiv(argv[1], "remove")) {
+      if (! is_admin) {
+        print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE);
+        exit(100);
+      }
       exit(pre_remove_service(argc - 2, argv + 2));
     }
   }
@@ -67,15 +58,28 @@ int main(int argc, char **argv) {
   /* Register messages */
   if (is_admin) create_messages();
 
-  /* Start service magic */
-  SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
-  if (! StartServiceCtrlDispatcher(table)) {
-    unsigned long error = GetLastError();
-    /* User probably ran nssm with no argument */
-    if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) exit(usage(1));
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);
-    exit(100);
+  /*
+    Optimisation for Windows 2000:
+    When we're run from the command line the StartServiceCtrlDispatcher() call
+    will time out after a few seconds on Windows 2000.  On newer versions the
+    call returns instantly.  Check for stdin first and only try to call the
+    function if there's no input stream found.  Although it's possible that
+    we're running with input redirected it's much more likely that we're
+    actually running as a service.
+    This will save time when running with no arguments from a command prompt.
+  */
+  if (_fileno(stdin) < 0) {
+    /* Start service magic */
+    SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
+    if (! StartServiceCtrlDispatcher(table)) {
+      unsigned long error = GetLastError();
+      /* User probably ran nssm with no argument */
+      if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) exit(usage(1));
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);
+      exit(100);
+    }
   }
+  else exit(usage(1));
 
   /* And nothing more to do */
   exit(0);