Split get_output_handles() into get_io_parameters().

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index 5efffe0..cf30cd4 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -71,7 +71,7 @@ int get_createfile_parameters(HKEY key, TCHAR *prefix, TCHAR *path, unsigned lon
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, prefix, _T("get_createfile_parameters()"), 0);\r
     return 1;\r
   }\r
-  switch (expand_parameter(key, value, path, MAX_PATH, true, false)) {\r
+  switch (expand_parameter(key, value, path, PATH_LENGTH, true, false)) {\r
     case 0: if (! path[0]) return 0; break; /* OK. */\r
     default: return 2; /* Error. */\r
   }\r
@@ -135,26 +135,14 @@ int delete_createfile_parameter(HKEY key, TCHAR *prefix, TCHAR *suffix) {
   return 1;\r
 }\r
 \r
-HANDLE append_to_file(TCHAR *path, unsigned long sharing, SECURITY_ATTRIBUTES *attributes, unsigned long disposition, unsigned long flags) {\r
-  HANDLE ret;\r
-\r
-  /* Try to append to the file first. */\r
-  ret = CreateFile(path, FILE_APPEND_DATA, sharing, attributes, disposition, flags, 0);\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
-    SetEndOfFile(ret);\r
+    if (SetFilePointer(ret, 0, 0, FILE_END) != INVALID_SET_FILE_POINTER) SetEndOfFile(ret);\r
     return ret;\r
   }\r
 \r
-  unsigned long error = GetLastError();\r
-  if (error != ERROR_FILE_NOT_FOUND) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(error), 0);\r
-    return (HANDLE) 0;\r
-  }\r
-\r
-  /* It didn't exist.  Create it. */\r
-  ret = CreateFile(path, FILE_WRITE_DATA, sharing, attributes, disposition, flags, 0);\r
-  if (! ret) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);\r
-\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, path, error_string(GetLastError()), 0);\r
   return ret;\r
 }\r
 \r
@@ -165,10 +153,10 @@ static void rotated_filename(TCHAR *path, TCHAR *rotated, unsigned long rotated_
     GetSystemTime(st);\r
   }\r
 \r
-  TCHAR buffer[MAX_PATH];\r
+  TCHAR buffer[PATH_LENGTH];\r
   memmove(buffer, path, sizeof(buffer));\r
   TCHAR *ext = PathFindExtension(buffer);\r
-  TCHAR extension[MAX_PATH];\r
+  TCHAR extension[PATH_LENGTH];\r
   _sntprintf_s(extension, _countof(extension), _TRUNCATE, _T("-%04u%02u%02uT%02u%02u%02u.%03u%s"), st->wYear, st->wMonth, st->wDay, st->wHour, st->wMinute, st->wSecond, st->wMilliseconds, ext);\r
   *ext = _T('\0');\r
   _sntprintf_s(rotated, rotated_len, _TRUNCATE, _T("%s%s"), buffer, extension);\r
@@ -227,7 +215,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
   /* Get new filename. */\r
   FileTimeToSystemTime(&info.ftLastWriteTime, &st);\r
 \r
-  TCHAR rotated[MAX_PATH];\r
+  TCHAR rotated[PATH_LENGTH];\r
   rotated_filename(path, rotated, _countof(rotated), &st);\r
 \r
   /* Rotate. */\r
@@ -242,63 +230,47 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
   return;\r
 }\r
 \r
-int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {\r
-  bool set_flags = false;\r
+int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {\r
+  if (! si) return 1;\r
 \r
-  /* Standard security attributes allowing inheritance. */\r
-  SECURITY_ATTRIBUTES attributes;\r
-  ZeroMemory(&attributes, sizeof(attributes));\r
-  attributes.bInheritHandle = true;\r
+  /* Allocate a new console so we get a fresh stdin, stdout and stderr. */\r
+  alloc_console(service);\r
 \r
   /* stdin */\r
-  if (get_createfile_parameters(key, NSSM_REG_STDIN, service->stdin_path, &service->stdin_sharing, NSSM_STDIN_SHARING, &service->stdin_disposition, NSSM_STDIN_DISPOSITION, &service->stdin_flags, NSSM_STDIN_FLAGS)) {\r
-    service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;\r
-    ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));\r
-    return 1;\r
-  }\r
-  if (si && service->stdin_path[0]) {\r
-    si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, service->stdin_disposition, service->stdin_flags, 0);\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
       log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);\r
       return 2;\r
     }\r
-    set_flags = true;\r
   }\r
 \r
   /* stdout */\r
-  if (get_createfile_parameters(key, NSSM_REG_STDOUT, service->stdout_path, &service->stdout_sharing, NSSM_STDOUT_SHARING, &service->stdout_disposition, NSSM_STDOUT_DISPOSITION, &service->stdout_flags, NSSM_STDOUT_FLAGS)) {\r
-    service->stdout_sharing = service->stdout_disposition = service->stdout_flags = 0;\r
-    ZeroMemory(service->stdout_path, _countof(service->stdout_path) * sizeof(TCHAR));\r
-    return 3;\r
-  }\r
-  if (si && service->stdout_path[0]) {\r
+  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);\r
-    HANDLE stdout_handle = append_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\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
 \r
-    /* Try online rotation only if a size threshold is set. */\r
     if (service->rotate_files && service->rotate_stdout_online) {\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->stdout_tid, &service->rotate_stdout_online);\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, error_string(GetLastError()), 0);\r
-          return 4;\r
-        }\r
-        service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
+        CloseHandle(service->stdout_pipe);\r
+        CloseHandle(si->hStdOutput);\r
       }\r
     }\r
+    else service->stdout_thread = 0;\r
 \r
-    set_flags = true;\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
+      service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
+    }\r
   }\r
 \r
   /* stderr */\r
-  if (get_createfile_parameters(key, NSSM_REG_STDERR, service->stderr_path, &service->stderr_sharing, NSSM_STDERR_SHARING, &service->stderr_disposition, NSSM_STDERR_DISPOSITION, &service->stderr_flags, NSSM_STDERR_FLAGS)) {\r
-    service->stderr_sharing = service->stderr_disposition = service->stderr_flags = 0;\r
-    ZeroMemory(service->stderr_path, _countof(service->stderr_path) * sizeof(TCHAR));\r
-    return 5;\r
-  }\r
   if (service->stderr_path[0]) {\r
     /* Same as stdout? */\r
     if (str_equiv(service->stderr_path, service->stdout_path)) {\r
@@ -307,43 +279,64 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       service->stderr_flags = service->stdout_flags;\r
       service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
 \r
-      if (si) {\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, error_string(GetLastError()), 0);\r
-          return 6;\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
     }\r
-    else if (si) {\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);\r
-      HANDLE stderr_handle = append_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\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
 \r
       if (service->rotate_files && service->rotate_stderr_online) {\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->stderr_tid, &service->rotate_stderr_online);\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, error_string(GetLastError()), 0);\r
-            return 7;\r
-          }\r
-          service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
+          CloseHandle(service->stderr_pipe);\r
+          CloseHandle(si->hStdError);\r
         }\r
       }\r
+      else service->stderr_thread = 0;\r
 \r
-      set_flags = true;\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
+        service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
+      }\r
     }\r
   }\r
 \r
-  if (! set_flags) return 0;\r
-\r
   /*\r
     We need to set the startup_info flags to make the new handles\r
     inheritable by the new process.\r
   */\r
-  if (si) si->dwFlags |= STARTF_USESTDHANDLES;\r
+  si->dwFlags |= STARTF_USESTDHANDLES;\r
+\r
+  if (service->no_console) return 0;\r
+\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
+  }\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
+  }\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
+    }\r
+  }\r
 \r
   return 0;\r
 }\r
@@ -390,8 +383,8 @@ static int try_read(logger_t *logger, void *address, unsigned long bufsize, unsi
   }\r
 \r
 complain_read:\r
-  /* Ignore the error if we've been requested to exit for rotation anyway. */\r
-  if (*logger->rotate_online == NSSM_ROTATE_ONLINE_ASAP) return ret;\r
+  /* Ignore the error if we've been requested to exit anyway. */\r
+  if (*logger->rotate_online != NSSM_ROTATE_ONLINE) return ret;\r
   if (! (*complained & COMPLAINED_READ)) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_READFILE_FAILED, logger->service_name, logger->path, error_string(error), 0);\r
   *complained |= COMPLAINED_READ;\r
   return ret;\r
@@ -498,7 +491,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
 \r
           /* Rotate. */\r
           *logger->rotate_online = NSSM_ROTATE_ONLINE;\r
-          TCHAR rotated[MAX_PATH];\r
+          TCHAR rotated[PATH_LENGTH];\r
           rotated_filename(logger->path, rotated, _countof(rotated), 0);\r
 \r
           /*\r
@@ -522,7 +515,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
           }\r
 \r
           /* Reopen. */\r
-          logger->write_handle = append_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
+          logger->write_handle = write_to_file(logger->path, logger->sharing, 0, logger->disposition, logger->flags);\r
           if (! logger->write_handle) {\r
             error = GetLastError();\r
             log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, logger->path, error_string(error), 0);\r