X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=nssm.cpp;h=2933dea9c4956d964fe4e5346872d9de0597146a;hb=13a14267e612fb6a28ddef57f30f9de2685fc2ff;hp=225d03811e737988eca89d5f18b8237e8063ddc0;hpb=d007ff22cecf2ce85cc68a1de81a010d4a65badc;p=nssm.git

diff --git a/nssm.cpp b/nssm.cpp
index 225d038..2933dea 100644
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -1,5 +1,7 @@
 #include "nssm.h"
 
+extern unsigned long tls_index;
+
 /* String function */
 int str_equiv(const char *a, const char *b) {
   int i;
@@ -13,10 +15,16 @@ int str_equiv(const char *a, const char *b) {
 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");
-  fprintf(stderr, "To install a service: nssm install [servicename]\n");
-  fprintf(stderr, "To remove a service: nssm remove [servicename]\n");
-  exit(ret);
+  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");
+  return(ret);
 }
 
 int main(int argc, char **argv) {
@@ -24,17 +32,25 @@ int main(int argc, char **argv) {
   if (argc == 1) exit(usage(1));
 
   /* Valid commands are install or remove */
-  if (str_equiv(argv[1], "install")) exit(install_service(argv[2]));
-  if (str_equiv(argv[1], "remove")) exit(remove_service(argv[2]));
+  if (str_equiv(argv[1], "install")) {
+    exit(pre_install_service(argc - 2, argv + 2));
+  }
+  if (str_equiv(argv[1], "remove")) {
+    exit(pre_remove_service(argc - 2, argv + 2));
+  }
   /* Undocumented: "run" is used to actually do service stuff */
   if (! str_equiv(argv[1], NSSM_RUN)) exit(usage(2));
 
+  /* Thread local storage for error message buffer */
+  tls_index = TlsAlloc();
+
+  /* Register messages */
+  create_messages();
+
   /* Start service magic */
   SERVICE_TABLE_ENTRY table[] = { { NSSM, service_main }, { 0, 0 } };
   if (! StartServiceCtrlDispatcher(table)) {
-    char *message = error_string(GetLastError());
-    eventprintf(EVENTLOG_ERROR_TYPE, "StartServiceCtrlDispatcher() failed: %s", message);
-    if (message) LocalFree(message);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(GetLastError()), 0);
     return 100;
   }