NSSM 2.0.

diff --git a/README.txt b/README.txt
index ae081d2..21718ba 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,5 +1,5 @@
 NSSM: The Non-Sucking Service Manager\r
-Version 1.0, 2003-05-30\r
+Version 2.0, 2006-09-09\r
 \r
 NSSM is a service helper program similar to srvany and cygrunsrv.  It can \r
 start any application as an NT service and will restart the service if it \r
@@ -7,21 +7,44 @@ fails for any reason.
 \r
 NSSM also has a graphical service installer and remover.\r
 \r
+Since version 2.0, the GUI can be bypassed by entering all appropriate \r
+options on the command line.\r
 \r
-Installation\r
-------------\r
+\r
+Usage\r
+-----\r
+In the usage notes below, arguments to the program may be written in angle \r
+brackets and/or square brackets.  <string> means you must insert the \r
+appropriate string and [<string>] means the string is optional.  See the \r
+examples below...\r
+\r
+\r
+Installation using the GUI\r
+--------------------------\r
 To install a service, run\r
 \r
-    nssm install servicename\r
+    nssm install <servicename>\r
 \r
 You will be prompted to enter the full path to the application you wish \r
-to run and any commandline options to pass to that application.\r
+to run and any command line options to pass to that application.\r
 \r
 Use the system service manager (services.msc) to control advanced service \r
 properties such as startup method and desktop interaction.  NSSM may \r
 support these options at a later time...\r
 \r
 \r
+Installation using the command line\r
+-----------------------------------\r
+To install a service, run\r
+\r
+    nssm install <servicename> <application> [<options>]\r
+\r
+NSSM will then attempt to install a service which runs the named application \r
+with the given options (if you specified any).\r
+\r
+Don't forget to enclose paths in "quotes" if they contain spaces!\r
+\r
+\r
 Managing the service\r
 --------------------\r
 NSSM will launch the application listed in the registry when you send it a \r
@@ -35,16 +58,41 @@ between each attempt, until the service is successfully started or you send
 it a stop signal.\r
 \r
 \r
-Removing services\r
------------------\r
+Removing services using the GUI\r
+-------------------------------\r
 NSSM can also remove services.  Run\r
 \r
-    nssm remove servicename\r
+    nssm remove <servicename>\r
 \r
 to remove a service.  You will prompted for confirmation before the service \r
 is removed.  Try not to remove essential system services...\r
 \r
 \r
+Removing service using the command line\r
+---------------------------------------\r
+To remove a service without confirmation from the GUI, run\r
+\r
+    nssm remove <servicename> confirm\r
+\r
+Try not to remove essential system services...\r
+\r
+\r
+Example usage\r
+-------------\r
+To install an Unreal Tournament server:\r
+\r
+    nssm install UT2004 c:\games\ut2004\system\ucc.exe server\r
+\r
+To remove the server:\r
+\r
+    nssm remove UT2004 confirm\r
+\r
+\r
+Building NSSM from source\r
+-------------------------\r
+NSSM is known to compile with Visual Studio 6 and Visual Studio 2005.\r
+\r
+\r
 Licence\r
 -------\r
 NSSM is public domain.  You may unconditionally use it and/or its source code \r

diff --git a/gui.cpp b/gui.cpp
index c094657..5041acd 100644 (file)
--- a/gui.cpp
+++ b/gui.cpp
@@ -69,7 +69,6 @@ int install(HWND window) {
   char name[STRING_SIZE];\r
   char exe[MAX_PATH];\r
   char flags[STRING_SIZE];\r
-  char dir[MAX_PATH];\r
 \r
   /* Get service name */\r
   if (! GetDlgItemText(window, IDC_NAME, name, sizeof(name))) {\r
@@ -92,56 +91,28 @@ int install(HWND window) {
   }\r
   else ZeroMemory(&flags, sizeof(flags));\r
 \r
-  /* Work out directory name */\r
-  unsigned int len = strlen(exe);\r
-  unsigned int i;\r
-  for (i = len; i && exe[i] != '\\' && exe[i] != '/'; i--);\r
-  memmove(dir, exe, i);\r
-  dir[i] = '\0';\r
-\r
-  /* Open service manager */\r
-  SC_HANDLE services = open_service_manager();\r
-  if (! services) {\r
-    MessageBox(0, "Can't open service manager!\nPerhaps you need to be an administrator...", NSSM, MB_OK);\r
-    return 2;\r
-  }\r
-  \r
-  /* Get path of this program */\r
-  char path[MAX_PATH];\r
-  GetModuleFileName(0, path, MAX_PATH);\r
-\r
-  /* Construct command */\r
-  char command[MAX_PATH];\r
-  int runlen = strlen(NSSM_RUN);\r
-  int pathlen = strlen(path);\r
-  if (pathlen + runlen + 2 >= MAX_PATH) {\r
-    MessageBox(0, "Path too long!\nThe full path to " NSSM " is too long.\nPlease install " NSSM " somewhere else...\n", NSSM, MB_OK);\r
-    return 3;\r
-  }\r
-  if (snprintf(command, sizeof(command), "%s %s", path, NSSM_RUN) < 0) {\r
-     MessageBox(0, "Error constructing ImagePath!\nThis really shouldn't happen.  You could be out of memory\nor the world may be about to end or something equally bad.", NSSM, MB_OK);\r
-     return 4;\r
-  }\r
+  /* See if it works */\r
+  switch (install_service(name, exe, flags)) {\r
+    case 2:\r
+      MessageBox(0, "Can't open service manager!\nPerhaps you need to be an administrator...", NSSM, MB_OK);\r
+      return 2;\r
 \r
-  /* Create the service */\r
-  SC_HANDLE service = CreateService(services, name, name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, command, 0, 0, 0, 0, 0);\r
-  if (! service) {\r
-    MessageBox(0, "Couldn't create service!\nPerhaps it is already installed...", NSSM, MB_OK);\r
-    CloseServiceHandle(services);\r
-    return 5;\r
-  }\r
+    case 3:\r
+      MessageBox(0, "Path too long!\nThe full path to " NSSM " is too long.\nPlease install " NSSM " somewhere else...\n", NSSM, MB_OK);\r
+      return 3;\r
 \r
-  /* Now we need to put the parameters into the registry */\r
-  if (create_parameters(name, exe, flags, dir)) {\r
-    MessageBox(0, "Couldn't set startup parameters for the service!\nDeleting the service...", NSSM, MB_OK);\r
-    DeleteService(service);\r
-    CloseServiceHandle(services);\r
-    return 6;\r
-  }\r
+    case 4:\r
+      MessageBox(0, "Error constructing ImagePath!\nThis really shouldn't happen.  You could be out of memory\nor the world may be about to end or something equally bad.", NSSM, MB_OK);\r
+      return 4;\r
 \r
-  /* Cleanup */\r
-  CloseServiceHandle(service);\r
-  CloseServiceHandle(services);\r
+    case 5:\r
+      MessageBox(0, "Couldn't create service!\nPerhaps it is already installed...", NSSM, MB_OK);\r
+      return 5;\r
+\r
+    case 6:\r
+      MessageBox(0, "Couldn't set startup parameters for the service!\nDeleting the service...", NSSM, MB_OK);\r
+      return 6;\r
+  }\r
 \r
   MessageBox(0, "Service successfully installed!", NSSM, MB_OK);\r
   return 0;\r
@@ -167,32 +138,20 @@ int remove(HWND window) {
   }\r
   else if (MessageBox(0, blurb, NSSM, MB_YESNO) != IDYES) return 0;\r
 \r
-  /* Open service manager */\r
-  SC_HANDLE services = open_service_manager();\r
-  if (! services) {\r
-    MessageBox(0, "Can't open service manager!\nPerhaps you need to be an administrator...", NSSM, MB_OK);\r
-    return 2;\r
-  }\r
-  \r
-  /* Try to open the service */\r
-  SC_HANDLE service = OpenService(services, name, SC_MANAGER_ALL_ACCESS);\r
-  if (! service) {\r
-    MessageBox(0, "Can't open service!\nPerhaps it isn't installed...", NSSM, MB_OK);\r
-    CloseServiceHandle(services);\r
-    return 3;\r
-  }\r
+  /* See if it works */\r
+  switch (remove_service(name)) {\r
+    case 2:\r
+      MessageBox(0, "Can't open service manager!\nPerhaps you need to be an administrator...", NSSM, MB_OK);\r
+      return 2;\r
 \r
-  /* Try to delete the service */\r
-  if (! DeleteService(service)) {\r
-    MessageBox(0, "Can't delete service!  Make sure the service is stopped and try again.\nIf this error persists, you may need to set the service NOT to start\nautomatically, reboot your computer and try removing it again.", NSSM, MB_OK);\r
-    CloseServiceHandle(service);\r
-    CloseServiceHandle(services);\r
-    return 4;\r
-  }\r
+    case 3:\r
+      MessageBox(0, "Can't open service!\nPerhaps it isn't installed...", NSSM, MB_OK);\r
+      return 3;\r
 \r
-  /* Cleanup */\r
-  CloseServiceHandle(service);\r
-  CloseServiceHandle(services);\r
+    case 4:\r
+      MessageBox(0, "Can't delete service!  Make sure the service is stopped and try again.\nIf this error persists, you may need to set the service NOT to start\nautomatically, reboot your computer and try removing it again.", NSSM, MB_OK);\r
+      return 4;\r
+  }\r
 \r
   MessageBox(0, "Service successfully removed!", NSSM, MB_OK);\r
   return 0;\r

diff --git a/nssm.cpp b/nssm.cpp
index 225d038..f412579 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -13,10 +13,16 @@ int str_equiv(const char *a, const char *b) {
 int usage(int ret) {\r
   fprintf(stderr, "NSSM: The non-sucking service manager\n");\r
   fprintf(stderr, "Version %s, %s\n", NSSM_VERSION, NSSM_DATE);\r
-  fprintf(stderr, "Usage: nssm option [args]\n");\r
-  fprintf(stderr, "To install a service: nssm install [servicename]\n");\r
-  fprintf(stderr, "To remove a service: nssm remove [servicename]\n");\r
-  exit(ret);\r
+  fprintf(stderr, "Usage: nssm <option> [args]\n\n");\r
+  fprintf(stderr, "To show service installation GUI:\n\n");\r
+  fprintf(stderr, "        nssm install [<servicename>]\n\n");\r
+  fprintf(stderr, "To install a service without confirmation:\n\n");\r
+  fprintf(stderr, "        nssm install <servicename> <app> [<args>]\n\n");\r
+  fprintf(stderr, "To show service removal GUI:\n\n");\r
+  fprintf(stderr, "        nssm remove [<servicename>]\n\n");\r
+  fprintf(stderr, "To remove a service without confirmation:\n\n");\r
+  fprintf(stderr, "        nssm remove <servicename> confirm\n");\r
+  return(ret);\r
 }\r
 \r
 int main(int argc, char **argv) {\r
@@ -24,8 +30,12 @@ int main(int argc, char **argv) {
   if (argc == 1) exit(usage(1));\r
 \r
   /* Valid commands are install or remove */\r
-  if (str_equiv(argv[1], "install")) exit(install_service(argv[2]));\r
-  if (str_equiv(argv[1], "remove")) exit(remove_service(argv[2]));\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
   /* Undocumented: "run" is used to actually do service stuff */\r
   if (! str_equiv(argv[1], NSSM_RUN)) exit(usage(2));\r
 \r

diff --git a/nssm.h b/nssm.h
index ab81239..0837126 100644 (file)
--- a/nssm.h
+++ b/nssm.h
@@ -10,9 +10,11 @@
 #include "service.h"\r
 #include "gui.h"\r
 \r
+int str_equiv(const char *, const char *);\r
+\r
 #define NSSM "nssm"\r
-#define NSSM_VERSION "1.0"\r
-#define NSSM_DATE "2003-05-30"\r
+#define NSSM_VERSION "2.0"\r
+#define NSSM_DATE "2006-09-09"\r
 #define NSSM_RUN "run"\r
 \r
 #endif\r

diff --git a/service.cpp b/service.cpp
index 9dbb310..05ca7cd 100644 (file)
--- a/service.cpp
+++ b/service.cpp
@@ -19,25 +19,117 @@ SC_HANDLE open_service_manager() {
   return ret;\r
 }\r
 \r
+/* About to install the service */\r
+int pre_install_service(int argc, char **argv) {\r
+  /* Show the dialogue box if we didn't give the */\r
+  if (argc < 2) return nssm_gui(IDD_INSTALL, argv[0]);\r
+\r
+  /* Arguments are optional */\r
+  char *flags;\r
+  if (argc == 2) flags = "";\r
+  else flags = argv[2];\r
+\r
+  return install_service(argv[0], argv[1], flags);\r
+}\r
+\r
+/* About to remove the service */\r
+int pre_remove_service(int argc, char **argv) {\r
+  /* Show dialogue box if we didn't pass service name and "confirm" */\r
+  if (argc < 2) return nssm_gui(IDD_REMOVE, argv[0]);\r
+  if (str_equiv(argv[1], "confirm")) return remove_service(argv[0]);\r
+  fprintf(stderr, "To remove a service without confirmation: nssm remove <servicename> confirm\n");\r
+  return 100;\r
+}\r
+\r
 /* Install the service */\r
-int install_service(char *name) {\r
-#ifdef GUI\r
-  /* Show the dialogue box */\r
-  return nssm_gui(IDD_INSTALL, name);\r
-#else\r
-  fprintf(stderr, "Unimplemented\n");\r
-  return 1;\r
-#endif\r
+int install_service(char *name, char *exe, char *flags) {\r
+  /* Open service manager */\r
+  SC_HANDLE services = open_service_manager();\r
+  if (! services) {\r
+    fprintf(stderr, "Error opening service manager!\n");\r
+    return 2;\r
+  }\r
+  \r
+  /* Get path of this program */\r
+  char path[MAX_PATH];\r
+  GetModuleFileName(0, path, MAX_PATH);\r
+\r
+  /* Construct command */\r
+  char command[MAX_PATH];\r
+  int runlen = strlen(NSSM_RUN);\r
+  int pathlen = strlen(path);\r
+  if (pathlen + runlen + 2 >= MAX_PATH) {\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
+    fprintf(stderr, "Out of memory for ImagePath!\n");\r
+    return 4;\r
+  }\r
+\r
+  /* Work out directory name */\r
+  unsigned int len = strlen(exe);\r
+  unsigned int i;\r
+  for (i = len; i && exe[i] != '\\' && exe[i] != '/'; i--);\r
+  char dir[MAX_PATH];\r
+  memmove(dir, exe, i);\r
+  dir[i] = '\0';\r
+\r
+  /* Create the service */\r
+  SC_HANDLE service = CreateService(services, name, name, SC_MANAGER_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, command, 0, 0, 0, 0, 0);\r
+  if (! service) {\r
+    fprintf(stderr, "Error creating service!\n");\r
+    CloseServiceHandle(services);\r
+    return 5;\r
+  }\r
+\r
+  /* Now we need to put the parameters into the registry */\r
+  if (create_parameters(name, exe, flags, dir)) {\r
+    fprintf(stderr, "Error setting startup parameters for the service!\n");\r
+    DeleteService(service);\r
+    CloseServiceHandle(services);\r
+    return 6;\r
+  }\r
+\r
+  /* Cleanup */\r
+  CloseServiceHandle(service);\r
+  CloseServiceHandle(services);\r
+\r
+  printf("Service \"%s\" installed successfully!\n", name);\r
+  return 0;\r
 }\r
 \r
 /* Remove the service */\r
 int remove_service(char *name) {\r
-#ifdef GUI\r
-  return nssm_gui(IDD_REMOVE, name);\r
-#else\r
-  fprintf(stderr, "Unimplemented\n");\r
-  return 1;\r
-#endif\r
+  /* Open service manager */\r
+  SC_HANDLE services = open_service_manager();\r
+  if (! services) {\r
+    fprintf(stderr, "Error opening service manager!\n");\r
+    return 2;\r
+  }\r
+  \r
+  /* Try to open the service */\r
+  SC_HANDLE service = OpenService(services, name, SC_MANAGER_ALL_ACCESS);\r
+  if (! service) {\r
+    fprintf(stderr, "Can't open service!");\r
+    CloseServiceHandle(services);\r
+    return 3;\r
+  }\r
+\r
+  /* Try to delete the service */\r
+  if (! DeleteService(service)) {\r
+    fprintf(stderr, "Error deleting service!\n");\r
+    CloseServiceHandle(service);\r
+    CloseServiceHandle(services);\r
+    return 4;\r
+  }\r
+\r
+  /* Cleanup */\r
+  CloseServiceHandle(service);\r
+  CloseServiceHandle(services);\r
+\r
+  printf("Service \"%s\" removed successfully!\n", name);\r
+  return 0;\r
 }\r
 \r
 /* Service initialisation */\r

diff --git a/service.h b/service.h
index 4fee550..250eb10 100644 (file)
--- a/service.h
+++ b/service.h
@@ -5,7 +5,9 @@ void WINAPI service_main(unsigned long, char **);
 unsigned long WINAPI service_control_handler(unsigned long, unsigned long, void *, void *);\r
 \r
 SC_HANDLE open_service_manager();\r
-int install_service(char *);\r
+int pre_install_service(int, char **);\r
+int pre_remove_service(int, char **);\r
+int install_service(char *, char *, char *);\r
 int remove_service(char *);\r
 int monitor_service();\r
 int start_service();\r