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

diff --git a/registry.cpp b/registry.cpp
index b526ee5..c794ed1 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -17,7 +17,7 @@ int create_messages() {
   }
 
   /* Get path of this program */
-  TCHAR path[MAX_PATH];
+  TCHAR path[PATH_LENGTH];
   GetModuleFileName(0, path, _countof(path));
 
   /* Try to register the module but don't worry so much on failure */
@@ -222,69 +222,11 @@ 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 expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {
+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);
   if (! buffer) {
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0);
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_string()"), 0);
     return 1;
   }
 
@@ -309,6 +251,11 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   /* Paths aren't allowed to contain quotes. */
   if (sanitise) PathUnquoteSpaces(buffer);
 
+  /* Do we want to expand the string? */
+  if (! expand) {
+    if (type == REG_EXPAND_SZ) type = REG_SZ;
+  }
+
   /* Technically we shouldn't expand environment strings from REG_SZ values */
   if (type != REG_EXPAND_SZ) {
     memmove(data, buffer, buflen);
@@ -327,6 +274,14 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   return 0;
 }
 
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {
+  return get_string(key, value, data, datalen, false, sanitise, true);
+}
+
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {
+  return get_string(key, value, data, datalen, true, sanitise, must_exist);
+}
+
 int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {
   return expand_parameter(key, value, data, datalen, sanitise, true);
 }
@@ -336,12 +291,23 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   Returns: 0 if it was set.
            1 on error.
 */
-int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {
-  if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;
+int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {
+  unsigned long type = expand ? REG_EXPAND_SZ : REG_SZ;
+  if (RegSetValueEx(key, value, 0, type, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;
   log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);
   return 1;
 }
 
+int set_string(HKEY key, TCHAR *value, TCHAR *string) {
+  return set_string(key, value, string, false);
+  return 1;
+}
+
+int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {
+  return set_string(key, value, string, true);
+  return 1;
+}
+
 /*
   Set an unsigned long in the registry.
   Returns: 0 if it was set.
@@ -585,7 +551,7 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
   if (get_number(key, NSSM_REG_ROTATE_BYTES_HIGH, &service->rotate_bytes_high, false) != 1) service->rotate_bytes_high = 0;
 
   /* Change to startup directory in case stdout/stderr are relative paths. */
-  TCHAR cwd[MAX_PATH];
+  TCHAR cwd[PATH_LENGTH];
   GetCurrentDirectory(_countof(cwd), cwd);
   SetCurrentDirectory(service->dir);