X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=io.cpp;h=a4f6abb5df09304551f1a1aa5e436ee96ab44318;hb=fa2f3fe4a81e6958717ae05f6d37af2da91bcd66;hp=2578800d2d9fdfbad9c67f731552fd336c8b6f6c;hpb=e0f182e26d12875ad2e03f634f5d8eb46f75038b;p=nssm.git

diff --git a/io.cpp b/io.cpp
index 2578800..a4f6abb 100644
--- 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);
     return 1;
   }
-  switch (expand_parameter(key, value, path, MAX_PATH, true, false)) {
+  switch (expand_parameter(key, value, path, PATH_LENGTH, true, false)) {
     case 0: if (! path[0]) return 0; break; /* OK. */
     default: return 2; /* Error. */
   }
@@ -165,10 +165,10 @@ static void rotated_filename(TCHAR *path, TCHAR *rotated, unsigned long rotated_
     GetSystemTime(st);
   }
 
-  TCHAR buffer[MAX_PATH];
+  TCHAR buffer[PATH_LENGTH];
   memmove(buffer, path, sizeof(buffer));
   TCHAR *ext = PathFindExtension(buffer);
-  TCHAR extension[MAX_PATH];
+  TCHAR extension[PATH_LENGTH];
   _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);
   *ext = _T('\0');
   _sntprintf_s(rotated, rotated_len, _TRUNCATE, _T("%s%s"), buffer, extension);
@@ -227,7 +227,7 @@ void rotate_file(TCHAR *service_name, TCHAR *path, unsigned long seconds, unsign
   /* Get new filename. */
   FileTimeToSystemTime(&info.ftLastWriteTime, &st);
 
-  TCHAR rotated[MAX_PATH];
+  TCHAR rotated[PATH_LENGTH];
   rotated_filename(path, rotated, _countof(rotated), &st);
 
   /* Rotate. */
@@ -250,21 +250,6 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
   ZeroMemory(&attributes, sizeof(attributes));
   attributes.bInheritHandle = true;
 
-  /* stdin */
-  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)) {
-    service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;
-    ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));
-    return 1;
-  }
-  if (si && service->stdin_path[0]) {
-    si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, service->stdin_disposition, service->stdin_flags, 0);
-    if (! si->hStdInput) {
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);
-      return 2;
-    }
-    set_flags = true;
-  }
-
   /* stdout */
   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)) {
     service->stdout_sharing = service->stdout_disposition = service->stdout_flags = 0;
@@ -288,7 +273,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
 
     if (! service->stdout_thread) {
       if (! DuplicateHandle(GetCurrentProcess(), stdout_handle, GetCurrentProcess(), &si->hStdOutput, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {
-        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, error_string(GetLastError()), 0);
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stdout"), error_string(GetLastError()), 0);
         return 4;
       }
       service->rotate_stdout_online = NSSM_ROTATE_OFFLINE;
@@ -314,7 +299,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
       if (si) {
         /* Two handles to the same file will create a race. */
         if (! DuplicateHandle(GetCurrentProcess(), si->hStdOutput, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_SAME_ACCESS)) {
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, error_string(GetLastError()), 0);
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDOUT, _T("stderr"), error_string(GetLastError()), 0);
           return 6;
         }
       }
@@ -336,7 +321,7 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
 
       if (! service->stderr_thread) {
         if (! DuplicateHandle(GetCurrentProcess(), stderr_handle, GetCurrentProcess(), &si->hStdError, 0, true, DUPLICATE_CLOSE_SOURCE | DUPLICATE_SAME_ACCESS)) {
-          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, error_string(GetLastError()), 0);
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_DUPLICATEHANDLE_FAILED, NSSM_REG_STDERR, _T("stderr"), error_string(GetLastError()), 0);
           return 7;
         }
         service->rotate_stderr_online = NSSM_ROTATE_OFFLINE;
@@ -346,6 +331,50 @@ int get_output_handles(nssm_service_t *service, HKEY key, STARTUPINFO *si) {
     }
   }
 
+  /* stdin */
+  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)) {
+    service->stdin_sharing = service->stdin_disposition = service->stdin_flags = 0;
+    ZeroMemory(service->stdin_path, _countof(service->stdin_path) * sizeof(TCHAR));
+    return 1;
+  }
+  if (si && service->stdin_path[0]) {
+    if (str_equiv(service->stdin_path, _T("|"))) {
+      /* Fake stdin with a pipe. */
+      if (set_flags) {
+        /*
+          None of this is necessary if we aren't redirecting stdout and/or
+          stderr as well.
+
+          If we don't redirect any handles the application will start and be
+          quite happy with its console.  If we start it with
+          STARTF_USESTDHANDLES set it will interpret a NULL value for
+          hStdInput as meaning no input.  Because the service starts with
+          no stdin we can't just pass GetStdHandle(STD_INPUT_HANDLE) to
+          the application.
+
+          The only way we can successfully redirect the application's output
+          while preventing programs which exit after reading all input from
+          exiting prematurely is to create a pipe between ourselves and the
+          application but write nothing to it.
+        */
+        if (! CreatePipe(&si->hStdInput, &service->stdin_pipe, 0, 0)) {
+          log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_STDIN_CREATEPIPE_FAILED, service->name, error_string(GetLastError()), 0);
+          return 2;
+        }
+        SetHandleInformation(si->hStdInput, HANDLE_FLAG_INHERIT, HANDLE_FLAG_INHERIT);
+      }
+    }
+    else {
+      si->hStdInput = CreateFile(service->stdin_path, FILE_READ_DATA, service->stdin_sharing, &attributes, service->stdin_disposition, service->stdin_flags, 0);
+      if (! si->hStdInput) {
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_CREATEFILE_FAILED, service->stdin_path, error_string(GetLastError()), 0);
+        return 2;
+      }
+
+      set_flags = true;
+    }
+  }
+
   if (! set_flags) return 0;
 
   /*
@@ -507,7 +536,7 @@ unsigned long WINAPI log_and_rotate(void *arg) {
 
           /* Rotate. */
           *logger->rotate_online = NSSM_ROTATE_ONLINE;
-          TCHAR rotated[MAX_PATH];
+          TCHAR rotated[PATH_LENGTH];
           rotated_filename(logger->path, rotated, _countof(rotated), 0);
 
           /*