Added get_string() and set_string().

Abstract expand_parameter() and set_expand_string() to allow working
with registry values of type REG_SZ as well a REG_EXPAND_SZ.

diff --git a/registry.cpp b/registry.cpp
index b526ee5..0cb552f 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -281,10 +281,10 @@ int unformat_environment(TCHAR *env, unsigned long envlen, TCHAR **unformatted,
   return 0;\r
 }\r
 \r
-int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool expand, bool sanitise, bool must_exist) {\r
   TCHAR *buffer = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, datalen);\r
   if (! buffer) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("expand_parameter()"), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_string()"), 0);\r
     return 1;\r
   }\r
 \r
@@ -309,6 +309,11 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   /* Paths aren't allowed to contain quotes. */\r
   if (sanitise) PathUnquoteSpaces(buffer);\r
 \r
+  /* Do we want to expand the string? */\r
+  if (! expand) {\r
+    if (type == REG_EXPAND_SZ) type = REG_SZ;\r
+  }\r
+\r
   /* Technically we shouldn't expand environment strings from REG_SZ values */\r
   if (type != REG_EXPAND_SZ) {\r
     memmove(data, buffer, buflen);\r
@@ -327,6 +332,14 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   return 0;\r
 }\r
 \r
+int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {\r
+  return get_string(key, value, data, datalen, false, sanitise, true);\r
+}\r
+\r
+int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise, bool must_exist) {\r
+  return get_string(key, value, data, datalen, true, sanitise, must_exist);\r
+}\r
+\r
 int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool sanitise) {\r
   return expand_parameter(key, value, data, datalen, sanitise, true);\r
 }\r
@@ -336,12 +349,23 @@ int expand_parameter(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen,
   Returns: 0 if it was set.\r
            1 on error.\r
 */\r
-int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
-  if (RegSetValueEx(key, value, 0, REG_EXPAND_SZ, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;\r
+int set_string(HKEY key, TCHAR *value, TCHAR *string, bool expand) {\r
+  unsigned long type = expand ? REG_EXPAND_SZ : REG_SZ;\r
+  if (RegSetValueEx(key, value, 0, type, (const unsigned char *) string, (unsigned long) (_tcslen(string) + 1) * sizeof(TCHAR)) == ERROR_SUCCESS) return 0;\r
   log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_SETVALUE_FAILED, value, error_string(GetLastError()), 0);\r
   return 1;\r
 }\r
 \r
+int set_string(HKEY key, TCHAR *value, TCHAR *string) {\r
+  return set_string(key, value, string, false);\r
+  return 1;\r
+}\r
+\r
+int set_expand_string(HKEY key, TCHAR *value, TCHAR *string) {\r
+  return set_string(key, value, string, true);\r
+  return 1;\r
+}\r
+\r
 /*\r
   Set an unsigned long in the registry.\r
   Returns: 0 if it was set.\r

diff --git a/registry.h b/registry.h
index 162b8b3..da3c8b8 100644 (file)
--- a/registry.h
+++ b/registry.h
@@ -37,8 +37,12 @@ int create_exit_action(TCHAR *, const TCHAR *, bool);
 int set_environment(TCHAR *, HKEY, TCHAR *, TCHAR **, unsigned long *);\r
 int format_environment(TCHAR *, unsigned long, TCHAR **, unsigned long *);\r
 int unformat_environment(TCHAR *, unsigned long, TCHAR **, unsigned long *);\r
+int get_string(HKEY, TCHAR *, TCHAR *, unsigned long, bool, bool, bool);\r
+int get_string(HKEY, TCHAR *, TCHAR *, unsigned long, bool);\r
 int expand_parameter(HKEY, TCHAR *, TCHAR *, unsigned long, bool, bool);\r
 int expand_parameter(HKEY, TCHAR *, TCHAR *, unsigned long, bool);\r
+int set_string(HKEY, TCHAR *, TCHAR *, bool);\r
+int set_string(HKEY, TCHAR *, TCHAR *);\r
 int set_expand_string(HKEY, TCHAR *, TCHAR *);\r
 int set_number(HKEY, TCHAR *, unsigned long);\r
 int get_number(HKEY, TCHAR *, unsigned long *, bool);\r