X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=eacde54ecef41fd9d1980a0f2aad17847bd21223;hb=40792fac2ef98e69c331b9cd5a9279dc3e1eb730;hp=1be5f4d76b02eb2a25cac655e8eff5695aa0c260;hpb=8d855fdbce4ba0b8cfeda551f137434731385c23;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index 1be5f4d..eacde54 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -102,28 +102,73 @@ int create_exit_action(char *service_name, const char *action_string) {
   return 0;
 }
 
-int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {
+int set_environment(char *service_name, HKEY key, char **env) {
+  unsigned long type = REG_MULTI_SZ;
+  unsigned long envlen = 0;
+
+  /* Dummy test to find buffer size */
+  unsigned long ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, NULL, &envlen);
+  if (ret != ERROR_SUCCESS) {
+    /* The service probably doesn't have any environment configured */
+    if (ret == ERROR_FILE_NOT_FOUND) return 0;
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);
+    return 1;
+  }
+
+  if (type != REG_MULTI_SZ) {
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, NSSM_REG_ENV, service_name, 0);
+    return 2;
+  }
+
+  /* Probably not possible */
+  if (! envlen) return 0;
+
+  *env = (char *) HeapAlloc(GetProcessHeap(), 0, envlen);
+  if (! *env) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, "environment registry", "set_environment()", 0);
+    return 3;
+  }
+
+  /* Actually get the strings */
+  ret = RegQueryValueEx(key, NSSM_REG_ENV, 0, &type, (unsigned char *) *env, &envlen);
+  if (ret != ERROR_SUCCESS) {
+    HeapFree(GetProcessHeap(), 0, *env);
+    *env = 0;
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_ENV, error_string(GetLastError()), 0);
+    return 4;
+  }
+
+  return 0;
+}
+
+int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise, bool must_exist) {
   unsigned char *buffer = (unsigned char *) HeapAlloc(GetProcessHeap(), 0, datalen);
   if (! buffer) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, "expand_parameter()", 0);
     return 1;
   }
 
+  ZeroMemory(data, datalen);
+
   unsigned long type = REG_EXPAND_SZ;
   unsigned long buflen = datalen;
 
   unsigned long ret = RegQueryValueEx(key, value, 0, &type, buffer, &buflen);
   if (ret != ERROR_SUCCESS) {
-    if (ret != ERROR_FILE_NOT_FOUND) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);
+    unsigned long error = GetLastError();
     HeapFree(GetProcessHeap(), 0, buffer);
+
+    if (ret == ERROR_FILE_NOT_FOUND) {
+      if (! must_exist) return 0;
+    }
+
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(error), 0);
     return 2;
   }
 
   /* Paths aren't allowed to contain quotes. */
   if (sanitise) PathUnquoteSpaces((LPSTR) buffer);
 
-  ZeroMemory(data, datalen);
-
   /* Technically we shouldn't expand environment strings from REG_SZ values */
   if (type != REG_EXPAND_SZ) {
     memmove(data, buffer, buflen);
@@ -133,7 +178,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
 
   ret = ExpandEnvironmentStrings((char *) buffer, data, datalen);
   if (! ret || ret > datalen) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, value, buffer, error_string(GetLastError()), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, buffer, error_string(GetLastError()), 0);
     HeapFree(GetProcessHeap(), 0, buffer);
     return 3;
   }
@@ -142,7 +187,39 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, b
   return 0;
 }
 
-int get_parameters(char *service_name, char *exe, int exelen, char *flags, int flagslen, char *dir, int dirlen, unsigned long *throttle_delay) {
+int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen, bool sanitise) {
+  return expand_parameter(key, value, data, datalen, sanitise, true);
+}
+
+/*
+  Query an unsigned long from the registry.
+  Returns:  1 if a number was retrieved.
+            0 if none was found and must_exist is false.
+           -1 if none was found and must_exist is true.
+           -2 otherwise.
+*/
+int get_number(HKEY key, char *value, unsigned long *number, bool must_exist) {
+  unsigned long type = REG_DWORD;
+  unsigned long number_len = sizeof(unsigned long);
+
+  int ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) number, &number_len);
+  if (ret == ERROR_SUCCESS) return 1;
+
+  if (ret == ERROR_FILE_NOT_FOUND) {
+    if (! must_exist) return 0;
+  }
+
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);
+  if (ret == ERROR_FILE_NOT_FOUND) return -1;
+
+  return -2;
+}
+
+int get_number(HKEY key, char *value, unsigned long *number) {
+  return get_number(key, value, number, true);
+}
+
+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) {
   unsigned long ret;
 
   /* Get registry */
@@ -192,6 +269,16 @@ 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);
   }
 
+  /* Try to get environment variables - may fail */
+  set_environment(service_name, key, env);
+
+  /* Try to get stdout and stderr */
+  if (get_output_handles(key, si)) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_GET_OUTPUT_HANDLES_FAILED, service_name, 0);
+    RegCloseKey(key);
+    return 5;
+  }
+
   /* Try to get throttle restart delay */
   unsigned long type = REG_DWORD;
   unsigned long buflen = sizeof(*throttle_delay);