X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=bd79dc3da435b3042e6fe269352443ff51b8bffa;hb=eac4d7eedfe338703f0103aac01af2ca306f615a;hp=c794ed186a4509904d99ccf45b7033e3cf2b67c9;hpb=e3b93d0c37ae200fa0375e4be6f435008050b385;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index c794ed1..bd79dc3 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -175,7 +175,7 @@ int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool edi
   return 0;
 }
 
-int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {
+int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {
   unsigned long type = REG_MULTI_SZ;
 
   /* Dummy test to find buffer size */
@@ -205,7 +205,7 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);
   if (! *env) {
     *envlen = 0;
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("set_environment()"), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_environment()"), 0);
     return 3;
   }
 
@@ -462,70 +462,9 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   }
 
   /* Try to get environment variables - may fail */
-  set_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);
+  get_environment(service->name, key, NSSM_REG_ENV, &service->env, &service->envlen);
   /* Environment variables to add to existing rather than replace - may fail. */
-  set_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);
-
-  if (si) {
-    if (service->env_extra) {
-      TCHAR *env;
-      unsigned long envlen;
-
-      /* Copy our environment for the application. */
-      if (! service->env) {
-        TCHAR *rawenv = GetEnvironmentStrings();
-        env = rawenv;
-        if (env) {
-          /*
-            The environment block starts with variables of the form
-            =C:=C:\Windows\System32 which we ignore.
-          */
-          while (*env == _T('=')) {
-            for ( ; *env; env++);
-            env++;
-          }
-          envlen = 0;
-          if (*env) {
-            while (true) {
-              for ( ; env[envlen]; envlen++);
-              if (! env[++envlen]) break;
-            }
-            envlen++;
-
-            service->envlen = envlen * sizeof(TCHAR);
-            service->env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, service->envlen);
-            memmove(service->env, env, service->envlen);
-            FreeEnvironmentStrings(rawenv);
-          }
-        }
-      }
-
-      /* Append extra variables to configured variables. */
-      if (service->env) {
-        envlen = service->envlen + service->env_extralen - sizeof(TCHAR)/*?*/;
-        env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envlen);
-        if (env) {
-          memmove(env, service->env, service->envlen - sizeof(TCHAR));
-          /* envlen is in bytes but env[i] is in characters. */
-          memmove(env + (service->envlen / sizeof(TCHAR)) - 1, service->env_extra, service->env_extralen);
-
-          HeapFree(GetProcessHeap(), 0, service->env);
-          HeapFree(GetProcessHeap(), 0, service->env_extra);
-          service->env = env;
-          service->envlen = envlen;
-        }
-        else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("environment"), _T("get_parameters()"), 0);
-      }
-      else {
-        /* Huh?  No environment at all? */
-        service->env = service->env_extra;
-        service->envlen = service->env_extralen;
-      }
-    }
-
-    service->env_extra = 0;
-    service->env_extralen = 0;
-  }
+  get_environment(service->name, key, NSSM_REG_ENV_EXTRA, &service->env_extra, &service->env_extralen);
 
   /* Try to get priority - may fail. */
   unsigned long priority;