Use close_handle().

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index b6f9d37..0c904be 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -83,6 +83,19 @@ static inline void write_bom(logger_t *logger, unsigned long *out) {
   }\r
 }\r
 \r
+void close_handle(HANDLE *handle, HANDLE *remember) {\r
+  if (remember) *remember = INVALID_HANDLE_VALUE;\r
+  if (! handle) return;\r
+  if (! *handle) return;\r
+  CloseHandle(*handle);\r
+  if (remember) *remember = *handle;\r
+  *handle = 0;\r
+}\r
+\r
+void close_handle(HANDLE *handle) {\r
+  close_handle(handle, NULL);\r
+}\r
+\r
 /* Get path, share mode, creation disposition and flags for a stream. */\r
 int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned long *sharing, unsigned long default_sharing, unsigned long *disposition, unsigned long default_disposition, unsigned long *flags, unsigned long default_flags, bool *copy_and_truncate) {\r
   TCHAR value[NSSM_STDIO_LENGTH];\r
@@ -174,9 +187,10 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
 }\r
 \r
 HANDLE write_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
+  static LARGE_INTEGER offset = { 0 };\r
   HANDLE ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
-  if (ret!= INVALID_HANDLE_VALUE) {\r
-    if (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);\r
+  if (ret != INVALID_HANDLE_VALUE) {\r
+    if (SetFilePointerEx(ret, offset, 0, FILE_END)) SetEndOfFile(ret);\r
     return ret;\r
   }\r
 \r
@@ -322,12 +336,7 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
     }\r
 \r
-    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) {\r
-      if (service->stdout_thread) {\r
-        CloseHandle(service->stdout_thread);\r
-        service->stdout_thread = 0;\r
-      }\r
-    }\r
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_si"), _T("stdout"))) close_handle(&service->stdout_thread);\r
   }\r
 \r
   /* stderr */\r
@@ -365,12 +374,7 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       }\r
     }\r
 \r
-    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) {\r
-      if (service->stderr_thread) {\r
-        CloseHandle(service->stderr_thread);\r
-        service->stderr_thread = 0;\r
-      }\r
-    }\r
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_si"), _T("stderr"))) close_handle(&service->stderr_thread);\r
   }\r
 \r
   /*\r
@@ -541,8 +545,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     address = &buffer;\r
     ret = try_read(logger, address, sizeof(buffer), &in, &complained);\r
     if (ret < 0) {\r
-      CloseHandle(logger->read_handle);\r
-      CloseHandle(logger->write_handle);\r
+      close_handle(&logger->read_handle);\r
+      close_handle(&logger->write_handle);\r
       HeapFree(GetProcessHeap(), 0, logger);\r
       return 2;\r
     }\r
@@ -559,8 +563,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           /* Write up to the newline. */\r
           ret = try_write(logger, address, i, &out, &complained);\r
           if (ret < 0) {\r
-            CloseHandle(logger->read_handle);\r
-            CloseHandle(logger->write_handle);\r
+            close_handle(&logger->read_handle);\r
+            close_handle(&logger->write_handle);\r
             HeapFree(GetProcessHeap(), 0, logger);\r
             return 3;\r
           }\r
@@ -577,7 +581,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             risk losing everything.\r
           */\r
           if (logger->copy_and_truncate) FlushFileBuffers(logger->write_handle);\r
-          CloseHandle(logger->write_handle);\r
+          close_handle(&logger->write_handle);\r
           bool ok = true;\r
           TCHAR *function;\r
           if (logger->copy_and_truncate) {\r
@@ -615,8 +619,8 @@ unsigned long WINAPI log_and_rotate(void *arg) {
             error = GetLastError();\r
             log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, logger->path, error_string(error), 0);\r
             /* Oh dear.  Now we can't log anything further. */\r
-            CloseHandle(logger->read_handle);\r
-            CloseHandle(logger->write_handle);\r
+            close_handle(&logger->read_handle);\r
+            close_handle(&logger->write_handle);\r
             HeapFree(GetProcessHeap(), 0, logger);\r
             return 4;\r
           }\r
@@ -641,15 +645,15 @@ unsigned long WINAPI log_and_rotate(void *arg) {
     ret = try_write(logger, address, in, &out, &complained);\r
     size += (__int64) out;\r
     if (ret < 0) {\r
-      CloseHandle(logger->read_handle);\r
-      CloseHandle(logger->write_handle);\r
+      close_handle(&logger->read_handle);\r
+      close_handle(&logger->write_handle);\r
       HeapFree(GetProcessHeap(), 0, logger);\r
       return 3;\r
     }\r
   }\r
 \r
-  CloseHandle(logger->read_handle);\r
-  CloseHandle(logger->write_handle);\r
+  close_handle(&logger->read_handle);\r
+  close_handle(&logger->write_handle);\r
   HeapFree(GetProcessHeap(), 0, logger);\r
   return 0;\r
 }\r