Added quote().

[nssm.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index d1a9a49..22e5a12 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -115,7 +115,7 @@ int kill_threads(nssm_service_t *service, kill_t *k) {
 \r
   /* Get a snapshot of all threads in the system. */\r
   HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);\r
-  if (! snapshot) {\r
+  if (snapshot == INVALID_HANDLE_VALUE) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATETOOLHELP32SNAPSHOT_THREAD_FAILED, k->name, error_string(GetLastError()), 0);\r
     return 0;\r
   }\r
@@ -241,7 +241,8 @@ int kill_console(nssm_service_t *service, kill_t *k) {
 \r
   /* Ignore the event ourselves. */\r
   ret = 0;\r
-  if (! SetConsoleCtrlHandler(0, TRUE)) {\r
+  BOOL ignored = SetConsoleCtrlHandler(0, TRUE);\r
+  if (! ignored) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETCONSOLECTRLHANDLER_FAILED, k->name, error_string(GetLastError()), 0);\r
     ret = 4;\r
   }\r
@@ -262,6 +263,11 @@ int kill_console(nssm_service_t *service, kill_t *k) {
   /* Wait for process to exit. */\r
   if (await_single_handle(k->status_handle, k->status, k->process_handle, k->name, _T(__FUNCTION__), k->kill_console_delay)) ret = 6;\r
 \r
+  /* Remove our handler. */\r
+  if (ignored && ! SetConsoleCtrlHandler(0, FALSE)) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETCONSOLECTRLHANDLER_FAILED, k->name, error_string(GetLastError()), 0);\r
+  }\r
+\r
   return ret;\r
 }\r
 \r
@@ -303,7 +309,7 @@ void kill_process_tree(nssm_service_t * service, kill_t *k, unsigned long ppid)
 \r
   /* Get a snapshot of all processes in the system. */\r
   HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);\r
-  if (! snapshot) {\r
+  if (snapshot == INVALID_HANDLE_VALUE) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATETOOLHELP32SNAPSHOT_PROCESS_FAILED, k->name, error_string(GetLastError()), 0);\r
     return;\r
   }\r