Allow controlling services.

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index 7c95611..792b62b 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -12,6 +12,17 @@ int str_equiv(const TCHAR *a, const TCHAR *b) {
   return 1;\r
 }\r
 \r
+/* Convert a string to a number. */\r
+int str_number(const TCHAR *string, unsigned long *number) {\r
+  if (! string) return 1;\r
+\r
+  TCHAR *bogus;\r
+  *number = _tcstoul(string, &bogus, 0);\r
+  if (*bogus) return 2;\r
+\r
+  return 0;\r
+}\r
+\r
 /* Remove basename of a path. */\r
 void strip_basename(TCHAR *buffer) {\r
   size_t len = _tcslen(buffer);\r
@@ -24,7 +35,8 @@ void strip_basename(TCHAR *buffer) {
 \r
 /* How to use me correctly */\r
 int usage(int ret) {\r
-  print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_DATE);\r
+  if (GetConsoleWindow()) print_message(stderr, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_DATE);\r
+  else popup_message(0, MB_OK, NSSM_MESSAGE_USAGE, NSSM_VERSION, NSSM_DATE);\r
   return(ret);\r
 }\r
 \r
@@ -39,13 +51,43 @@ void check_admin() {
   FreeSid(AdministratorsGroup);\r
 }\r
 \r
+/* See if we were launched from a console window. */\r
+static void check_console() {\r
+  /* If we're running in a service context there will be no console window. */\r
+  HWND console = GetConsoleWindow();\r
+  if (! console) return;\r
+\r
+  unsigned long pid;\r
+  if (! GetWindowThreadProcessId(console, &pid)) return;\r
+\r
+  /*\r
+    If the process associated with the console window handle is the same as\r
+    this process, we were not launched from an existing console.  The user\r
+    probably double-clicked our executable.\r
+  */\r
+  if (GetCurrentProcessId() != pid) return;\r
+\r
+  /* We close our new console so that subsequent messages appear in a popup. */\r
+  FreeConsole();\r
+}\r
+\r
 int _tmain(int argc, TCHAR **argv) {\r
+  check_console();\r
+\r
   /* Remember if we are admin */\r
   check_admin();\r
 \r
   /* Elevate */\r
   if (argc > 1) {\r
-    /* Valid commands are install, edit or remove */\r
+    /*\r
+      Valid commands are:\r
+      start, stop, pause, continue, install, edit, get, set, reset, unset, remove\r
+    */\r
+    if (str_equiv(argv[1], _T("start"))) exit(control_service(0, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("stop"))) exit(control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("pause"))) exit(control_service(SERVICE_CONTROL_PAUSE, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("continue"))) exit(control_service(SERVICE_CONTROL_CONTINUE, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("status"))) exit(control_service(SERVICE_CONTROL_INTERROGATE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("install"))) {\r
       if (! is_admin) {\r
         print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL);\r
@@ -53,12 +95,15 @@ int _tmain(int argc, TCHAR **argv) {
       }\r
       exit(pre_install_service(argc - 2, argv + 2));\r
     }\r
-    if (str_equiv(argv[1], _T("edit"))) {\r
+    if (str_equiv(argv[1], _T("edit")) || str_equiv(argv[1], _T("get")) || str_equiv(argv[1], _T("set")) || str_equiv(argv[1], _T("reset")) || str_equiv(argv[1], _T("unset"))) {\r
       if (! is_admin) {\r
         print_message(stderr, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT);\r
         exit(100);\r
       }\r
-      exit(pre_edit_service(argc - 2, argv + 2));\r
+      int ret = pre_edit_service(argc - 1, argv + 1);\r
+      /* There might be a password here. */\r
+      for (int i = 0; i < argc; i++) SecureZeroMemory(argv[i], _tcslen(argv[i]) * sizeof(TCHAR));\r
+      exit(ret);\r
     }\r
     if (str_equiv(argv[1], _T("remove"))) {\r
       if (! is_admin) {\r