Argument consistency.

[nssm.git] / io.cpp

diff --git a/io.cpp b/io.cpp
index 42e4447..cf30cd4 100644 (file)
--- a/io.cpp
+++ b/io.cpp
@@ -230,32 +230,23 @@ 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 redirect = false;\r
+int get_output_handles(nssm_service_t *service, STARTUPINFO *si) {\r
+  if (! si) return 1;\r
+\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
+  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
-\r
-    redirect = 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 = write_to_file(service->stdout_path, service->stdout_sharing, 0, service->stdout_disposition, service->stdout_flags);\r
     if (! stdout_handle) return 4;\r
@@ -277,16 +268,9 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       }\r
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;\r
     }\r
-\r
-    redirect = true;\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
@@ -295,15 +279,13 @@ 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, _T("stderr"), 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 = write_to_file(service->stderr_path, service->stderr_sharing, 0, service->stderr_disposition, service->stderr_flags);\r
       if (! stderr_handle) return 7;\r
@@ -325,35 +307,16 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
         }\r
         service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;\r
       }\r
-\r
-      redirect = true;\r
     }\r
   }\r
 \r
-  if (! redirect || ! si) return 0;\r
-\r
-  /* Allocate a new console so we get a fresh stdin, stdout and stderr. */\r
-  FreeConsole();\r
-  AllocConsole();\r
-\r
-  /* Set a title like "[NSSM] Jenkins" */\r
-  TCHAR displayname[SERVICE_NAME_LENGTH];\r
-  unsigned long len = _countof(displayname);\r
-  SC_HANDLE services = open_service_manager();\r
-  if (services) {\r
-    if (! GetServiceDisplayName(services, service->name, displayname, &len)) _sntprintf_s(displayname, _countof(displayname), _TRUNCATE, _T("%s"), service->name);\r
-    CloseServiceHandle(services);\r
-  }\r
-\r
-  TCHAR title[65535];\r
-  _sntprintf_s(title, _countof(title), _TRUNCATE, _T("[%s] %s\n"), NSSM, displayname);\r
-  SetConsoleTitle(title);\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