Moved environment functions to a new file.

Moved format_environment(), unformat_environment() and
test_environment() to env.cpp.

env.cpp

@@ -0,0 +1,96 @@
+#include "nssm.h"
+
+/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */
+int format_environment(TCHAR *env, unsigned long envlen, TCHAR **formatted, unsigned long *newlen) {
+  unsigned long i, j;
+  *newlen = envlen;
+
+  if (! *newlen) {
+    *formatted = 0;
+    return 0;
+  }
+
+  for (i = 0; i < envlen; i++) if (! env[i] && env[i + 1]) ++*newlen;
+
+  *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
+  if (! *formatted) {
+    *newlen = 0;
+    return 1;
+  }
+
+  for (i = 0, j = 0; i < envlen; i++) {
+    (*formatted)[j] = env[i];
+    if (! env[i]) {
+      if (env[i + 1]) {
+        (*formatted)[j] = _T('\r');
+        (*formatted)[++j] = _T('\n');
+      }
+    }
+    j++;
+  }
+
+  return 0;
+}
+
+/* Strip CR and replace LF with NULL. */
+int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted, unsigned long *newlen) {
+  unsigned long i, j;
+  *newlen = 0;
+
+  if (! envlen) {
+    *unformatted = 0;
+    return 0;
+  }
+
+  for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) ++*newlen;
+  /* Must end with two NULLs. */
+  *newlen += 2;
+
+  *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
+  if (! *unformatted) return 1;
+
+  for (i = 0, j = 0; i < envlen; i++) {
+    if (env[i] == _T('\r')) continue;
+    if (env[i] == _T('\n')) (*unformatted)[j] = _T('\0');
+    else (*unformatted)[j] = env[i];
+    j++;
+  }
+
+  return 0;
+}
+
+/*
+  Verify an environment block.
+  Returns:  1 if environment is invalid.
+            0 if environment is OK.
+           -1 on error.
+*/
+int test_environment(TCHAR *env) {
+  TCHAR path[PATH_LENGTH];
+  GetModuleFileName(0, path, _countof(path));
+  STARTUPINFO si;
+  ZeroMemory(&si, sizeof(si));
+  si.cb = sizeof(si);
+  PROCESS_INFORMATION pi;
+  ZeroMemory(&pi, sizeof(pi));
+  unsigned long flags = CREATE_SUSPENDED;
+#ifdef UNICODE
+  flags |= CREATE_UNICODE_ENVIRONMENT;
+#endif
+
+  /*
+    Try to relaunch ourselves but with the candidate environment set.
+    Assuming no solar flare activity, the only reason this would fail is if
+    the environment were invalid.
+  */
+  if (CreateProcess(0, path, 0, 0, 0, flags, env, 0, &si, &pi)) {
+    TerminateProcess(pi.hProcess, 0);
+  }
+  else {
+    unsigned long error = GetLastError();
+    if (error == ERROR_INVALID_PARAMETER) return 1;
+    else return -1;
+  }
+
+  return 0;
+}

env.h

@@ -0,0 +1,8 @@
+#ifndef ENV_H
+#define ENV_H
+
+int format_environment(TCHAR *, unsigned long, TCHAR **, unsigned long *);
+int unformat_environment(TCHAR *, unsigned long, TCHAR **, unsigned long *);
+int test_environment(TCHAR *);
+
+#endif

nssm.h

@@ -41,6 +41,7 @@
 #include <tchar.h>
 #include <windows.h>
 #include "service.h"
+#include "env.h"
 #include "event.h"
 #include "imports.h"
 #include "messages.h"

nssm.vcproj

@@ -402,6 +402,10 @@
 			Name="Source Files"
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
+			<File
+				RelativePath="env.cpp"
+				>
+			</File>
 			<File
 				RelativePath="event.cpp"
 				>
@@ -635,6 +639,10 @@
 			Name="Header Files"
 			Filter="h;hpp;hxx;hm;inl"
 			>
+			<File
+				RelativePath="env.h"
+				>
+			</File>
 			<File
 				RelativePath="event.h"
 				>

process.cpp

@@ -313,39 +313,3 @@ void kill_process_tree(nssm_service_t *service, unsigned long pid, unsigned long
 
   CloseHandle(process_handle);
 }
-
-/*
-  Verify an environment block.
-  Returns:  1 if environment is invalid.
-            0 if environment is OK.
-           -1 on error.
-*/
-int test_environment(TCHAR *env) {
-  TCHAR path[PATH_LENGTH];
-  GetModuleFileName(0, path, _countof(path));
-  STARTUPINFO si;
-  ZeroMemory(&si, sizeof(si));
-  si.cb = sizeof(si);
-  PROCESS_INFORMATION pi;
-  ZeroMemory(&pi, sizeof(pi));
-  unsigned long flags = CREATE_SUSPENDED;
-#ifdef UNICODE
-  flags |= CREATE_UNICODE_ENVIRONMENT;
-#endif
-
-  /*
-    Try to relaunch ourselves but with the candidate environment set.
-    Assuming no solar flare activity, the only reason this would fail is if
-    the environment were invalid.
-  */
-  if (CreateProcess(0, path, 0, 0, 0, flags, env, 0, &si, &pi)) {
-    TerminateProcess(pi.hProcess, 0);
-  }
-  else {
-    unsigned long error = GetLastError();
-    if (error == ERROR_INVALID_PARAMETER) return 1;
-    else return -1;
-  }
-
-  return 0;
-}

process.h

@@ -17,6 +17,5 @@ int kill_threads(nssm_service_t *, kill_t *);
 int kill_console(nssm_service_t *);
 int kill_process(nssm_service_t *, HANDLE, unsigned long, unsigned long);
 void kill_process_tree(nssm_service_t *, unsigned long, unsigned long, unsigned long);
-int test_environment(TCHAR *);
 
 #endif

registry.cpp

@@ -222,64 +222,6 @@ int set_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   return 0;
 }
 
-/* Replace NULL with CRLF. Leave NULL NULL as the end marker. */
-int format_environment(TCHAR *env, unsigned long envlen, TCHAR **formatted, unsigned long *newlen) {
-  unsigned long i, j;
-  *newlen = envlen;
-
-  if (! *newlen) {
-    *formatted = 0;
-    return 0;
-  }
-
-  for (i = 0; i < envlen; i++) if (! env[i] && env[i + 1]) ++*newlen;
-
-  *formatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
-  if (! *formatted) {
-    *newlen = 0;
-    return 1;
-  }
-
-  for (i = 0, j = 0; i < envlen; i++) {
-    (*formatted)[j] = env[i];
-    if (! env[i]) {
-      if (env[i + 1]) {
-        (*formatted)[j] = _T('\r');
-        (*formatted)[++j] = _T('\n');
-      }
-    }
-    j++;
-  }
-
-  return 0;
-}
-
-/* Strip CR and replace LF with NULL. */
-int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted, unsigned long *newlen) {
-  unsigned long i, j;
-  *newlen = 0;
-
-  if (! envlen) {
-    *unformatted = 0;
-    return 0;
-  }
-
-  for (i = 0; i < envlen; i++) if (env[i] != _T('\r')) ++*newlen;
-  /* Must end with two NULLs. */
-  *newlen += 2;
-
-  *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
-  if (! *unformatted) return 1;
-
-  for (i = 0, j = 0; i < envlen; i++) {
-    if (env[i] == _T('\r')) continue;
-    if (env[i] == _T('\n')) (*unformatted)[j] = _T('\0');
-    else (*unformatted)[j] = env[i];
-    j++;
-  }
-
-  return 0;
-}
 
 int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool expand, bool sanitise, bool must_exist) {
   TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);

registry.h

@@ -35,8 +35,6 @@ int create_messages();
 int create_parameters(nssm_service_t *, bool);
 int create_exit_action(TCHAR *, const TCHAR *, bool);
 int set_environment(TCHAR *, HKEY, TCHAR *, TCHAR **, unsigned long *);
-int format_environment(TCHAR *, unsigned long, TCHAR **, unsigned long *);
-int unformat_environment(TCHAR *, unsigned long, TCHAR **, unsigned long *);
 int get_string(HKEY, TCHAR *, TCHAR *, unsigned long, bool, bool, bool);
 int get_string(HKEY, TCHAR *, TCHAR *, unsigned long, bool);
 int expand_parameter(HKEY, TCHAR *, TCHAR *, unsigned long, bool, bool);