Support srvany's AppEnvironment registry value.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index 6b70a96..5172c50 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -102,6 +102,45 @@ int create_exit_action(char *service_name, const char *action_string) {
   return 0;\r
 }\r
 \r
+int set_environment(char *service_name, HKEY key, char **env) {\r
+  unsigned long type = REG_MULTI_SZ;\r
+  unsigned long envlen = 0;\r
+\r
+  /* Dummy test to find buffer size */\r
+  unsigned long ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, NULL, &envlen);\r
+  if (ret != ERROR_SUCCESS) {\r
+    /* The service probably doesn't have any environment configured */\r
+    if (ret == ERROR_FILE_NOT_FOUND) return 0;\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
+    return 1;\r
+  }\r
+\r
+  if (type != REG_MULTI_SZ) {\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, NSSM_REG_ENV, service_name, 0);\r
+    return 2;\r
+  }\r
+\r
+  /* Probably not possible */\r
+  if (! envlen) return 0;\r
+\r
+  *env = (char *) HeapAlloc(GetProcessHeap(), 0, envlen);\r
+  if (! *env) {\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "environment registry", "set_environment()", 0);\r
+    return 3;\r
+  }\r
+\r
+  /* Actually get the strings */\r
+  ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, (unsigned char *) *env, &envlen);\r
+  if (ret != ERROR_SUCCESS) {\r
+    HeapFree(GetProcessHeap(), 0, *env);\r
+    *env = 0;\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);\r
+    return 4;\r
+  }\r
+\r
+  return 0;\r
+}\r
+\r
 int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {\r
   unsigned char *buffer = (unsigned char *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
   if (! buffer) {\r
@@ -142,7 +181,7 @@ 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, unsigned long *throttle_delay) {\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
   unsigned long ret;\r
 \r
   /* Get registry */\r
@@ -192,6 +231,9 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_DIR, NSSM_REG_DIR, service_name, dir, 0);\r
   }\r
 \r
+  /* Try to get environment variables - may fail */\r
+  set_environment(service_name, key, env);\r
+\r
   /* Try to get throttle restart delay */\r
   unsigned long type = REG_DWORD;\r
   unsigned long buflen = sizeof(*throttle_delay);\r