Use close_handle().

[nssm.git] / nssm.cpp

diff --git a/nssm.cpp b/nssm.cpp
index 9314753..d70c6b4 100644 (file)
--- a/nssm.cpp
+++ b/nssm.cpp
@@ -8,6 +8,12 @@ static TCHAR unquoted_imagepath[PATH_LENGTH];
 static TCHAR imagepath[PATH_LENGTH];\r
 static TCHAR imageargv0[PATH_LENGTH];\r
 \r
+void nssm_exit(int status) {\r
+  free_imports();\r
+  unsetup_utf8();\r
+  exit(status);\r
+}\r
+\r
 /* Are two strings case-insensitively equivalent? */\r
 int str_equiv(const TCHAR *a, const TCHAR *b) {\r
   size_t len = _tcslen(a);\r
@@ -219,22 +225,13 @@ const TCHAR *nssm_exe() {
 }\r
 \r
 int _tmain(int argc, TCHAR **argv) {\r
-  check_console();\r
-\r
-#ifdef UNICODE\r
-  /*\r
-    Ensure we write in UTF-16 mode, so that non-ASCII characters don't get\r
-    mangled.  If we were compiled in ANSI mode it won't work.\r
-   */\r
-  _setmode(_fileno(stdout), _O_U16TEXT);\r
-  _setmode(_fileno(stderr), _O_U16TEXT);\r
-#endif\r
+  if (check_console()) setup_utf8();\r
 \r
   /* Remember if we are admin */\r
   check_admin();\r
 \r
   /* Set up function pointers. */\r
-  if (get_imports()) exit(111);\r
+  if (get_imports()) nssm_exit(111);\r
 \r
   /* Remember our path for later. */\r
   _sntprintf_s(imageargv0, _countof(imageargv0), _TRUNCATE, _T("%s"), argv[0]);\r
@@ -249,33 +246,34 @@ int _tmain(int argc, TCHAR **argv) {
       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(NSSM_SERVICE_CONTROL_START, 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("start"))) nssm_exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("stop"))) nssm_exit(control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("restart"))) {\r
       int ret = control_service(SERVICE_CONTROL_STOP, argc - 2, argv + 2);\r
-      if (ret) exit(ret);\r
-      exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));\r
+      if (ret) nssm_exit(ret);\r
+      nssm_exit(control_service(NSSM_SERVICE_CONTROL_START, argc - 2, argv + 2));\r
     }\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("rotate"))) exit(control_service(NSSM_SERVICE_CONTROL_ROTATE, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("pause"))) nssm_exit(control_service(SERVICE_CONTROL_PAUSE, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("continue"))) nssm_exit(control_service(SERVICE_CONTROL_CONTINUE, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("status"))) nssm_exit(control_service(SERVICE_CONTROL_INTERROGATE, argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("rotate"))) nssm_exit(control_service(NSSM_SERVICE_CONTROL_ROTATE, argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("install"))) {\r
-      if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL));\r
+      if (! is_admin) nssm_exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_INSTALL));\r
       create_messages();\r
-      exit(pre_install_service(argc - 2, argv + 2));\r
+      nssm_exit(pre_install_service(argc - 2, argv + 2));\r
     }\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")) || str_equiv(argv[1], _T("dump"))) {\r
       int ret = pre_edit_service(argc - 1, argv + 1);\r
-      if (ret == 3 && ! is_admin && argc == 3) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT));\r
+      if (ret == 3 && ! is_admin && argc == 3) nssm_exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_EDIT));\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
+      nssm_exit(ret);\r
     }\r
-    if (str_equiv(argv[1], _T("list"))) exit(list_nssm_services());\r
+    if (str_equiv(argv[1], _T("list"))) nssm_exit(list_nssm_services(argc - 2, argv + 2));\r
+    if (str_equiv(argv[1], _T("processes"))) nssm_exit(service_process_tree(argc - 2, argv + 2));\r
     if (str_equiv(argv[1], _T("remove"))) {\r
-      if (! is_admin) exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE));\r
-      exit(pre_remove_service(argc - 2, argv + 2));\r
+      if (! is_admin) nssm_exit(elevate(argc, argv, NSSM_MESSAGE_NOT_ADMINISTRATOR_CANNOT_REMOVE));\r
+      nssm_exit(pre_remove_service(argc - 2, argv + 2));\r
     }\r
   }\r
 \r
@@ -301,14 +299,13 @@ int _tmain(int argc, TCHAR **argv) {
     if (! StartServiceCtrlDispatcher(table)) {\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
+      if (error == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) nssm_exit(usage(1));\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DISPATCHER_FAILED, error_string(error), 0);\r
-      free_imports();\r
-      exit(100);\r
+      nssm_exit(100);\r
     }\r
   }\r
-  else exit(usage(1));\r
+  else nssm_exit(usage(1));\r
 \r
   /* And nothing more to do */\r
-  exit(0);\r
+  nssm_exit(0);\r
 }\r