Handle second parameter of unformat_double_null().

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index d20b2c2..4e432ab 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -67,6 +67,14 @@ int create_messages() {
   return 0;\r
 }\r
 \r
+long enumerate_registry_values(HKEY key, unsigned long *index, TCHAR *name, unsigned long namelen) {\r
+  unsigned long type;\r
+  unsigned long datalen = namelen;\r
+  long error = RegEnumValue(key, *index, name, &datalen, 0, &type, 0, 0);\r
+  if (error == ERROR_SUCCESS) ++*index;\r
+  return error;\r
+}\r
+\r
 int create_parameters(nssm_service_t *service, bool editing) {\r
   /* Try to open the registry */\r
   HKEY key = open_registry(service->name, KEY_WRITE);\r
@@ -232,48 +240,50 @@ int create_exit_action(TCHAR *service_name, const TCHAR *action_string, bool edi
 \r
 int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, unsigned long *envlen) {\r
   unsigned long type = REG_MULTI_SZ;\r
+  unsigned long envsize;\r
+\r
+  *envlen = 0;\r
 \r
   /* Dummy test to find buffer size */\r
-  unsigned long ret = RegQueryValueEx(key, value, 0, &type, NULL, envlen);\r
+  unsigned long ret = RegQueryValueEx(key, value, 0, &type, NULL, &envsize);\r
   if (ret != ERROR_SUCCESS) {\r
     *env = 0;\r
-    *envlen = 0;\r
     /* The service probably doesn't have any environment configured */\r
     if (ret == ERROR_FILE_NOT_FOUND) return 0;\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(ret), 0);\r
     return 1;\r
   }\r
 \r
   if (type != REG_MULTI_SZ) {\r
-    *env = 0;\r
-    *envlen = 0;\r
     log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_INVALID_ENVIRONMENT_STRING_TYPE, value, service_name, 0);\r
+    *env = 0;\r
     return 2;\r
   }\r
 \r
   /* Probably not possible */\r
-  if (! *envlen) return 0;\r
+  if (! envsize) return 0;\r
 \r
   /* Previously initialised? */\r
   if (*env) HeapFree(GetProcessHeap(), 0, *env);\r
 \r
-  *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, *envlen);\r
+  *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envsize);\r
   if (! *env) {\r
-    *envlen = 0;\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_environment()"), 0);\r
     return 3;\r
   }\r
 \r
-  /* Actually get the strings */\r
-  ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) *env, envlen);\r
+  /* Actually get the strings. */\r
+  ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) *env, &envsize);\r
   if (ret != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(ret), 0);\r
     HeapFree(GetProcessHeap(), 0, *env);\r
     *env = 0;\r
-    *envlen = 0;\r
     return 4;\r
   }\r
 \r
+  /* Value retrieved by RegQueryValueEx() is SIZE not COUNT. */\r
+  *envlen = (unsigned long) environment_length(env);\r
+\r
   return 0;\r
 }\r
 \r
@@ -292,14 +302,13 @@ int get_string(HKEY key, TCHAR *value, TCHAR *data, unsigned long datalen, bool
 \r
   unsigned long ret = RegQueryValueEx(key, value, 0, &type, (unsigned char *) buffer, &buflen);\r
   if (ret != ERROR_SUCCESS) {\r
-    unsigned long error = GetLastError();\r
     HeapFree(GetProcessHeap(), 0, buffer);\r
 \r
     if (ret == ERROR_FILE_NOT_FOUND) {\r
       if (! must_exist) return 0;\r
     }\r
 \r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(error), 0);\r
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(ret), 0);\r
     return 2;\r
   }\r
 \r
@@ -390,7 +399,7 @@ int get_number(HKEY key, TCHAR *value, unsigned long *number, bool must_exist) {
     if (! must_exist) return 0;\r
   }\r
 \r
-  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+  log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(ret), 0);\r
   if (ret == ERROR_FILE_NOT_FOUND) return -1;\r
 \r
   return -2;\r
@@ -432,32 +441,40 @@ int format_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **formatted, unsign
   return 0;\r
 }\r
 \r
-/* Strip CR and replace LF with NULL. */\r
-int unformat_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **unformatted, unsigned long *newlen) {\r
+/* Strip CR and replace LF with NULL.  */\r
+int unformat_double_null(TCHAR *formatted, unsigned long formattedlen, TCHAR **dn, unsigned long *newlen) {\r
   unsigned long i, j;\r
   *newlen = 0;\r
 \r
-  if (! dnlen) {\r
-    *unformatted = 0;\r
+  /* Don't count trailing NULLs. */\r
+  for (i = 0; i < formattedlen; i++) {\r
+    if (! formatted[i]) {\r
+      formattedlen = i;\r
+      break;\r
+    }\r
+  }\r
+\r
+  if (! formattedlen) {\r
+    *dn = 0;\r
     return 0;\r
   }\r
 \r
-  for (i = 0; i < dnlen; i++) if (dn[i] != _T('\r')) ++*newlen;\r
+  for (i = 0; i < formattedlen; i++) if (formatted[i] != _T('\r')) ++*newlen;\r
 \r
   /* Skip blank lines. */\r
-  for (i = 0; i < dnlen; i++) {\r
-    if (dn[i] == _T('\r') && dn[i + 1] == _T('\n')) {\r
+  for (i = 0; i < formattedlen; i++) {\r
+    if (formatted[i] == _T('\r') && formatted[i + 1] == _T('\n')) {\r
       /* This is the last CRLF. */\r
-      if (i >= dnlen - 2) break;\r
+      if (i >= formattedlen - 2) break;\r
 \r
       /*\r
         Strip at the start of the block or if the next characters are\r
         CRLF too.\r
       */\r
-      if (! i || (dn[i + 2] == _T('\r') && dn[i + 3] == _T('\n'))) {\r
-        for (j = i + 2; j < dnlen; j++) dn[j - 2] = dn[j];\r
-        dn[dnlen--] = _T('\0');\r
-        dn[dnlen--] = _T('\0');\r
+      if (! i || (formatted[i + 2] == _T('\r') && formatted[i + 3] == _T('\n'))) {\r
+        for (j = i + 2; j < formattedlen; j++) formatted[j - 2] = formatted[j];\r
+        formatted[formattedlen--] = _T('\0');\r
+        formatted[formattedlen--] = _T('\0');\r
         i--;\r
         --*newlen;\r
       }\r
@@ -467,13 +484,13 @@ int unformat_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **unformatted, un
   /* Must end with two NULLs. */\r
   *newlen += 2;\r
 \r
-  *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
-  if (! *unformatted) return 1;\r
+  *dn = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));\r
+  if (! *dn) return 1;\r
 \r
-  for (i = 0, j = 0; i < dnlen; i++) {\r
-    if (dn[i] == _T('\r')) continue;\r
-    if (dn[i] == _T('\n')) (*unformatted)[j] = _T('\0');\r
-    else (*unformatted)[j] = dn[i];\r
+  for (i = 0, j = 0; i < formattedlen; i++) {\r
+    if (formatted[i] == _T('\r')) continue;\r
+    if (formatted[i] == _T('\n')) (*dn)[j] = _T('\0');\r
+    else (*dn)[j] = formatted[i];\r
     j++;\r
   }\r
 \r
@@ -492,7 +509,7 @@ void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned
         _sntprintf_s(milliseconds, _countof(milliseconds), _TRUNCATE, _T("%lu"), default_value);\r
         log_event(EVENTLOG_WARNING_TYPE, event, service_name, value, milliseconds, 0);\r
       }\r
-      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(GetLastError()), 0);\r
+      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(ret), 0);\r
     }\r
   }\r
   else ok = true;\r
@@ -703,7 +720,7 @@ int get_parameters(nssm_service_t *service, STARTUPINFO *si) {
       if (type != REG_DWORD) {\r
         log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_BOGUS_STOP_METHOD_SKIP, service->name, NSSM_REG_STOP_METHOD_SKIP, NSSM, 0);\r
       }\r
-      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_STOP_METHOD_SKIP, error_string(GetLastError()), 0);\r
+      else log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, NSSM_REG_STOP_METHOD_SKIP, error_string(ret), 0);\r
     }\r
   }\r
   else stop_ok = true;\r