Added quote().

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index 45d1e76..b6f9d37 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -4,6 +4,25 @@
 #define COMPLAINED_WRITE (1 << 1)\r
 #define COMPLAINED_ROTATE (1 << 2)\r
 \r
+static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *source_description, TCHAR *dest_description, unsigned long flags) {\r
+  if (! dest_handle_ptr) return 1;\r
+\r
+  if (! DuplicateHandle(GetCurrentProcess(), source_handle, GetCurrentProcess(), dest_handle_ptr, 0, true, flags)) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, source_description, dest_description, error_string(GetLastError()), 0);\r
+    return 2;\r
+  }\r
+  return 0;\r
+}\r
+\r
+static int dup_handle(HANDLE source_handle, HANDLE *dest_handle_ptr, TCHAR *source_description, TCHAR *dest_description) {\r
+  return dup_handle(source_handle, dest_handle_ptr, source_description, dest_description, DUPLICATE_SAME_ACCESS);\r
+}\r
+\r
+/*\r
+  read_handle:  read from application\r
+  pipe_handle:  stdout of application\r
+  write_handle: to file\r
+*/\r
 static HANDLE create_logging_thread(TCHAR *service_name, TCHAR *path, unsigned long sharing, unsigned long disposition, unsigned long flags, HANDLE *read_handle_ptr, HANDLE *pipe_handle_ptr, HANDLE *write_handle_ptr, unsigned long rotate_bytes_low, unsigned long rotate_bytes_high, unsigned long rotate_delay, unsigned long *tid_ptr, unsigned long *rotate_online, bool copy_and_truncate) {\r
   *tid_ptr = 0;\r
 \r
@@ -156,7 +175,7 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
 \r
 HANDLE write_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
   HANDLE ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
-  if (ret) {\r
+  if (ret!= INVALID_HANDLE_VALUE) {\r
     if (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);\r
     return ret;\r
   }\r
@@ -192,7 +211,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
 \r
   /* Try to open the file to check if it exists and to get attributes. */\r
   HANDLE file = CreateFile(path, 0, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);\r
-  if (file) {\r
+  if (file != INVALID_HANDLE_VALUE) {\r
     /* Get file attributes. */\r
     if (! GetFileInformationByHandle(file, &info)) {\r
       /* Reuse current time for rotation timestamp. */\r
@@ -275,7 +294,7 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
   /* stdin */\r
   if (service->stdin_path[0]) {\r
     si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, 0, service->stdin_disposition, service->stdin_flags, 0);\r
-    if (! si->hStdInput) {\r
+    if (si->hStdInput == INVALID_HANDLE_VALUE) {\r
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);\r
       return 2;\r
     }\r
@@ -285,25 +304,30 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
   if (service->stdout_path[0]) {\r
     if (service->rotate_files) rotate_file(service->name, service->stdout_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, service->stdout_copy_and_truncate);\r
     HANDLE stdout_handle = write_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
-    if (! stdout_handle) return 4;\r
+    if (stdout_handle == INVALID_HANDLE_VALUE) return 4;\r
+    service->stdout_si = 0;\r
 \r
-    if (service->rotate_files && service->rotate_stdout_online) {\r
+    if (service->use_stdout_pipe) {\r
       service->stdout_pipe = si->hStdOutput = 0;\r
-      service->stdout_thread = create_logging_thread(service->name, service->stdout_path, service->stdout_sharing, service->stdout_disposition, service->stdout_flags, &service->stdout_pipe, &si->hStdOutput, &stdout_handle, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, &service->stdout_tid, &service->rotate_stdout_online, service->stdout_copy_and_truncate);\r
+      service->stdout_thread = create_logging_thread(service->name, service->stdout_path, service->stdout_sharing, service->stdout_disposition, service->stdout_flags, &service->stdout_pipe, &service->stdout_si, &stdout_handle, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, &service->stdout_tid, &service->rotate_stdout_online, service->stdout_copy_and_truncate);\r
       if (! service->stdout_thread) {\r
         CloseHandle(service->stdout_pipe);\r
-        CloseHandle(si->hStdOutput);\r
+        CloseHandle(service->stdout_si);\r
       }\r
     }\r
     else service->stdout_thread = 0;\r
 \r
     if (! service->stdout_thread) {\r
-      if (! DuplicateHandle(GetCurrentProcess(), stdout_handle, GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {\r
-        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stdout"), error_string(GetLastError()), 0);\r
-        return 4;\r
-      }\r
+      if (dup_handle(stdout_handle, &service->stdout_si, NSSM_REG_STDOUT, _T("stdout"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 4;\r
       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
   }\r
 \r
   /* stderr */\r
@@ -316,34 +340,37 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
       service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
 \r
       /* Two handles to the same file will create a race. */\r
-      if (! DuplicateHandle(GetCurrentProcess(), si->hStdOutput, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stderr"), error_string(GetLastError()), 0);\r
-        return 6;\r
-      }\r
+      /* XXX: Here we assume that either both or neither handle must be a pipe. */\r
+      if (dup_handle(service->stdout_si, &service->stderr_si, _T("stdout"), _T("stderr"))) return 6;\r
     }\r
     else {\r
       if (service->rotate_files) rotate_file(service->name, service->stderr_path, service->rotate_seconds, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, service->stderr_copy_and_truncate);\r
       HANDLE stderr_handle = write_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\r
-      if (! stderr_handle) return 7;\r
+      if (stderr_handle == INVALID_HANDLE_VALUE) return 7;\r
+      service->stderr_si = 0;\r
 \r
-      if (service->rotate_files && service->rotate_stderr_online) {\r
+      if (service->use_stderr_pipe) {\r
         service->stderr_pipe = si->hStdError = 0;\r
-        service->stderr_thread = create_logging_thread(service->name, service->stderr_path, service->stderr_sharing, service->stderr_disposition, service->stderr_flags, &service->stderr_pipe, &si->hStdError, &stderr_handle, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, &service->stderr_tid, &service->rotate_stderr_online, service->stderr_copy_and_truncate);\r
+        service->stderr_thread = create_logging_thread(service->name, service->stderr_path, service->stderr_sharing, service->stderr_disposition, service->stderr_flags, &service->stderr_pipe, &service->stderr_si, &stderr_handle, service->rotate_bytes_low, service->rotate_bytes_high, service->rotate_delay, &service->stderr_tid, &service->rotate_stderr_online, service->stderr_copy_and_truncate);\r
         if (! service->stderr_thread) {\r
           CloseHandle(service->stderr_pipe);\r
-          CloseHandle(si->hStdError);\r
+          CloseHandle(service->stderr_si);\r
         }\r
       }\r
       else service->stderr_thread = 0;\r
 \r
       if (! service->stderr_thread) {\r
-        if (! DuplicateHandle(GetCurrentProcess(), stderr_handle, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {\r
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, _T("stderr"), error_string(GetLastError()), 0);\r
-          return 7;\r
-        }\r
+        if (dup_handle(stderr_handle, &service->stderr_si, NSSM_REG_STDERR, _T("stderr"), DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) return 7;\r
         service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
       }\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
   }\r
 \r
   /*\r
@@ -356,22 +383,36 @@ int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {
 \r
   /* Redirect other handles. */\r
   if (! si->hStdInput) {\r
-    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_INPUT_HANDLE), GetCurrentProcess(), &si->hStdInput, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_INPUT_HANDLE"), _T("stdin"), error_string(GetLastError()), 0);\r
-      return 8;\r
-    }\r
+    if (dup_handle(GetStdHandle(STD_INPUT_HANDLE), &si->hStdInput, _T("STD_INPUT_HANDLE"), _T("stdin"))) return 8;\r
   }\r
   if (! si->hStdOutput) {\r
-    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_OUTPUT_HANDLE), GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_OUTPUT_HANDLE"), _T("stdout"), error_string(GetLastError()), 0);\r
-      return 9;\r
-    }\r
+    if (dup_handle(GetStdHandle(STD_OUTPUT_HANDLE), &si->hStdOutput, _T("STD_OUTPUT_HANDLE"), _T("stdout"))) return 9;\r
   }\r
   if (! si->hStdError)  {\r
-    if (! DuplicateHandle(GetCurrentProcess(), GetStdHandle(STD_ERROR_HANDLE), GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, _T("STD_ERROR_HANDLE"), _T("stderr"), error_string(GetLastError()), 0);\r
-      return 10;\r
+    if (dup_handle(GetStdHandle(STD_ERROR_HANDLE), &si->hStdError, _T("STD_ERROR_HANDLE"), _T("stderr"))) return 10;\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
+/* Reuse output handles for a hook. */\r
+int use_output_handles(nssm_service_t *service, STARTUPINFO *si) {\r
+  si->dwFlags &= ~STARTF_USESTDHANDLES;\r
+\r
+  if (service->stdout_si) {\r
+    if (dup_handle(service->stdout_si, &si->hStdOutput, _T("stdout_pipe"), _T("hStdOutput"))) return 1;\r
+    si->dwFlags |= STARTF_USESTDHANDLES;\r
+  }\r
+\r
+  if (service->stderr_si) {\r
+    if (dup_handle(service->stderr_si, &si->hStdError, _T("stderr_pipe"), _T("hStdError"))) {\r
+      if (si->hStdOutput) {\r
+        si->dwFlags &= ~STARTF_USESTDHANDLES;\r
+        CloseHandle(si->hStdOutput);\r
+      }\r
+      return 2;\r
     }\r
+    si->dwFlags |= STARTF_USESTDHANDLES;\r
   }\r
 \r
   return 0;\r
@@ -570,7 +611,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
 \r
           /* Reopen. */\r
           logger->write_handle = write_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
-          if (! logger->write_handle) {\r
+          if (logger->write_handle == INVALID_HANDLE_VALUE) {\r
             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