Allow specifying output streams.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 5172c50..eacde54 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -141,28 +141,34 @@ int set_environment(char *service_name, HKEY key, char **env) {
   return 0;\r
 }\r
 \r
-int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {\r
+int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
   unsigned char *buffer = (unsigned char *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
   if (! buffer) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, "expand_parameter()", 0);\r
     return 1;\r
   }\r
 \r
+  ZeroMemory(data, datalen);\r
+\r
   unsigned long type = REG_EXPAND_SZ;\r
   unsigned long buflen = datalen;\r
 \r
   unsigned long ret = RegQueryValueEx(key, value, 0, &type, buffer, &buflen);\r
   if (ret != ERROR_SUCCESS) {\r
-    if (ret != ERROR_FILE_NOT_FOUND) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+    unsigned long error = GetLastError();\r
     HeapFree(GetProcessHeap(), 0, buffer);\r
+\r
+    if (ret == ERROR_FILE_NOT_FOUND) {\r
+      if (! must_exist) return 0;\r
+    }\r
+\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(error), 0);\r
     return 2;\r
   }\r
 \r
   /* Paths aren't allowed to contain quotes. */\r
   if (sanitise) PathUnquoteSpaces((LPSTR) buffer);\r
 \r
-  ZeroMemory(data, datalen);\r
-\r
   /* Technically we shouldn't expand environment strings from REG_SZ values */\r
   if (type != REG_EXPAND_SZ) {\r
     memmove(data, buffer, buflen);\r
@@ -181,7 +187,39 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
   return 0;\r
 }\r
 \r
-int get_parameters(char *service_name, char *exe, int exelen, char *flags, int flagslen, char *dir, int dirlen, char **env, unsigned long *throttle_delay) {\r
+int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {\r
+  return expand_parameter(key, value, data, datalen, sanitise, true);\r
+}\r
+\r
+/*\r
+  Query an unsigned long from the registry.\r
+  Returns:  1 if a number was retrieved.\r
+            0 if none was found and must_exist is false.\r
+           -1 if none was found and must_exist is true.\r
+           -2 otherwise.\r
+*/\r
+int get_number(HKEY key, char *value, unsigned long *number, bool must_exist) {\r
+  unsigned long type = REG_DWORD;\r
+  unsigned long number_len = sizeof(unsigned long);\r
+\r
+  int ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) number, &number_len);\r
+  if (ret == ERROR_SUCCESS) return 1;\r
+\r
+  if (ret == ERROR_FILE_NOT_FOUND) {\r
+    if (! must_exist) return 0;\r
+  }\r
+\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+  if (ret == ERROR_FILE_NOT_FOUND) return -1;\r
+\r
+  return -2;\r
+}\r
+\r
+int get_number(HKEY key, char *value, unsigned long *number) {\r
+  return get_number(key, value, number, true);\r
+}\r
+\r
+int get_parameters(char *service_name, char *exe, int exelen, char *flags, int flagslen, char *dir, int dirlen, char **env, unsigned long *throttle_delay, STARTUPINFO *si) {\r
   unsigned long ret;\r
 \r
   /* Get registry */\r
@@ -234,6 +272,13 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
   /* Try to get environment variables - may fail */\r
   set_environment(service_name, key, env);\r
 \r
+  /* Try to get stdout and stderr */\r
+  if (get_output_handles(key, si)) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service_name, 0);\r
+    RegCloseKey(key);\r
+    return 5;\r
+  }\r
+\r
   /* Try to get throttle restart delay */\r
   unsigned long type = REG_DWORD;\r
   unsigned long buflen = sizeof(*throttle_delay);\r