Handle missing registry values.

Warn if AppParameters is missing.

Warn if AppDirectory is missing or unset and choose a fallback directory.
First try to find the parent directory of the application.  If that
fails, eg because the application path is just "notepad" or something,
expand %SYSTEMROOT%.  If THAT fails it's time to give up and go home.

Thanks Arve Knudsen.

diff --git a/messages.mc b/messages.mc
index 0b49b3d..19cee3c 100644 (file)
--- a/messages.mc
+++ b/messages.mc
@@ -219,3 +219,27 @@ Failed to terminate process with PID %1 for service %2:
 %3
 .
 
+MessageId = +1
+SymbolicName = NSSM_EVENT_NO_FLAGS
+Severity = Warning
+Language = English
+Registry key %1 is unset for service %2.
+No flags will be passed to %3 when it starts.
+.
+
+MessageId = +1
+SymbolicName = NSSM_EVENT_NO_DIR
+Severity = Warning
+Language = English
+Registry key %1 is unset for service %2.
+Assuming startup directory %3.
+.
+
+MessageId = +1
+SymbolicName = NSSM_EVENT_NO_DIR_AND_NO_FALLBACK
+Severity = Error
+Language = English
+Registry key %1 is unset for service %2.
+Additionally, ExpandEnvironmentStrings("%%SYSTEMROOT%%") failed when trying to choose a fallback startup directory.
+.
+

diff --git a/registry.cpp b/registry.cpp
index 29b4ed2..cb0b3e6 100644 (file)
--- a/registry.cpp
+++ b/registry.cpp
@@ -112,8 +112,9 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) {
   unsigned long type = REG_EXPAND_SZ;\r
   unsigned long buflen = datalen;\r
 \r
-  if (RegQueryValueEx(key, value, 0, &type, buffer, &buflen) != ERROR_SUCCESS) {\r
-    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, GetLastError(), 0);\r
+  unsigned long ret = RegQueryValueEx(key, value, 0, &type, buffer, &buflen);\r
+  if (ret != ERROR_SUCCESS) {\r
+    if (ret != ERROR_FILE_NOT_FOUND) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, GetLastError(), 0);\r
     HeapFree(GetProcessHeap(), 0, buffer);\r
     return 2;\r
   }\r
@@ -126,7 +127,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) {
     return 0;\r
   }\r
 \r
-  unsigned long ret = ExpandEnvironmentStrings((char *) buffer, data, datalen);\r
+  ret = ExpandEnvironmentStrings((char *) buffer, data, datalen);\r
   if (! ret || ret > datalen) {\r
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, value, buffer, GetLastError(), 0);\r
     HeapFree(GetProcessHeap(), 0, buffer);\r
@@ -158,16 +159,31 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f
     return 3;\r
   }\r
 \r
-  /* Try to get flags - may fail */\r
+  /* Try to get flags - may fail and we don't care */\r
   if (expand_parameter(key, NSSM_REG_FLAGS, flags, flagslen)) {\r
-    RegCloseKey(key);\r
-    return 4;\r
-  }\r
-\r
-  /* Try to get startup directory - may fail */\r
-  if (expand_parameter(key, NSSM_REG_DIR, dir, dirlen)) {\r
-    RegCloseKey(key);\r
-    return 5;\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_FLAGS, NSSM_REG_FLAGS, service_name, exe, 0);\r
+    ZeroMemory(flags, flagslen);\r
+  }\r
+\r
+  /* Try to get startup directory - may fail and we fall back to a default */\r
+  if (expand_parameter(key, NSSM_REG_DIR, dir, dirlen) || ! dir[0]) {\r
+    /* Our buffers are defined to be long enough for this to be safe */\r
+    size_t i;\r
+    for (i = strlen(exe); i && exe[i] != '\\' && exe[i] != '/'; i--);\r
+    if (i) {\r
+      memmove(dir, exe, i);\r
+      dir[i] = '\0';\r
+    }\r
+    else {\r
+      /* Help! */\r
+      unsigned long ret = ExpandEnvironmentStrings("%SYSTEMROOT%", dir, dirlen);\r
+      if (! ret || ret > dirlen) {\r
+        log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_NO_DIR_AND_NO_FALLBACK, NSSM_REG_DIR, service_name, 0);\r
+        RegCloseKey(key);\r
+        return 4;\r
+      }\r
+    }\r
+    log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_DIR, NSSM_REG_DIR, service_name, dir, 0);\r
   }\r
 \r
   /* Close registry */\r