EventMessageFile should be unquoted.

[nssm.git] / registry.cpp

diff --git a/registry.cpp b/registry.cpp
index e499933..20033f8 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -2,6 +2,39 @@
 \r
 extern const TCHAR *exit_action_strings[];\r
 \r
+static int service_registry_path(const TCHAR *service_name, bool parameters, const TCHAR *sub, TCHAR *buffer, unsigned long buflen) {\r
+  int ret;\r
+\r
+  if (parameters) {\r
+    if (sub) ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY _T("\\") NSSM_REG_PARAMETERS _T("\\%s"), service_name, sub);\r
+    else ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY _T("\\") NSSM_REG_PARAMETERS, service_name);\r
+  }\r
+  else ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY, service_name);\r
+\r
+  return ret;\r
+}\r
+\r
+static HKEY open_registry_key(const TCHAR *registry, REGSAM sam, bool must_exist) {\r
+  HKEY key;\r
+\r
+  if (sam & KEY_SET_VALUE) {\r
+    if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, &key, 0) != ERROR_SUCCESS) {\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
+      return 0;\r
+    }\r
+  }\r
+  else {\r
+    long error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, &key);\r
+    if (error != ERROR_SUCCESS) {\r
+      if (error == ERROR_FILE_NOT_FOUND && ! must_exist) return 0;\r
+      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
+      return 0;\r
+    }\r
+  }\r
+\r
+  return key;\r
+}\r
+\r
 int create_messages() {\r
   HKEY key;\r
 \r
@@ -17,7 +50,7 @@ int create_messages() {
   }\r
 \r
   /* Get path of this program */\r
-  const TCHAR *path = nssm_imagepath();\r
+  const TCHAR *path = nssm_unquoted_imagepath();\r
 \r
   /* Try to register the module but don't worry so much on failure */\r
   RegSetValueEx(key, _T("EventMessageFile"), 0, REG_SZ, (const unsigned char *) path, (unsigned long) (_tcslen(path) +  1) * sizeof(TCHAR));\r
@@ -460,39 +493,6 @@ void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned
   if (! ok) *buffer = default_value;\r
 }\r
 \r
-static int service_registry_path(const TCHAR *service_name, bool parameters, const TCHAR *sub, TCHAR *buffer, unsigned long buflen) {\r
-  int ret;\r
-\r
-  if (parameters) {\r
-    if (sub) ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY _T("\\") NSSM_REG_PARAMETERS _T("\\%s"), service_name, sub);\r
-    else ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY _T("\\") NSSM_REG_PARAMETERS, service_name);\r
-  }\r
-  else ret = _sntprintf_s(buffer, buflen, _TRUNCATE, NSSM_REGISTRY, service_name);\r
-\r
-  return ret;\r
-}\r
-\r
-static HKEY open_registry_key(const TCHAR *registry, REGSAM sam, bool must_exist) {\r
-  HKEY key;\r
-\r
-  if (sam & KEY_SET_VALUE) {\r
-    if (RegCreateKeyEx(HKEY_LOCAL_MACHINE, registry, 0, 0, REG_OPTION_NON_VOLATILE, sam, 0, &key, 0) != ERROR_SUCCESS) {\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
-      return 0;\r
-    }\r
-  }\r
-  else {\r
-    long error = RegOpenKeyEx(HKEY_LOCAL_MACHINE, registry, 0, sam, &key);\r
-    if (error != ERROR_SUCCESS) {\r
-      if (error == ERROR_FILE_NOT_FOUND && ! must_exist) return 0;\r
-      log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OPENKEY_FAILED, registry, error_string(GetLastError()), 0);\r
-      return 0;\r
-    }\r
-  }\r
-\r
-  return key;\r
-}\r
-\r
 HKEY open_service_registry(const TCHAR *service_name, REGSAM sam, bool must_exist) {\r
   /* Get registry */\r
   TCHAR registry[KEY_LENGTH];\r