From 6ee4bf0c79840175fea1a8035c9ef4ce6749d779 Mon Sep 17 00:00:00 2001 From: Iain Patterson Date: Tue, 25 Jan 2011 22:38:05 +0000 Subject: [PATCH] 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. --- messages.mc | 24 ++++++++++++++++++++++++ registry.cpp | 40 ++++++++++++++++++++++++++++------------ 2 files changed, 52 insertions(+), 12 deletions(-) diff --git a/messages.mc b/messages.mc index 0b49b3d..19cee3c 100644 --- 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 --- 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; unsigned long buflen = datalen; - if (RegQueryValueEx(key, value, 0, &type, buffer, &buflen) != ERROR_SUCCESS) { - log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, GetLastError(), 0); + unsigned long ret = RegQueryValueEx(key, value, 0, &type, buffer, &buflen); + if (ret != ERROR_SUCCESS) { + if (ret != ERROR_FILE_NOT_FOUND) log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, GetLastError(), 0); HeapFree(GetProcessHeap(), 0, buffer); return 2; } @@ -126,7 +127,7 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) { return 0; } - unsigned long ret = ExpandEnvironmentStrings((char *) buffer, data, datalen); + ret = ExpandEnvironmentStrings((char *) buffer, data, datalen); if (! ret || ret > datalen) { log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_EXPANDENVIRONMENTSTRINGS_FAILED, value, buffer, GetLastError(), 0); HeapFree(GetProcessHeap(), 0, buffer); @@ -158,16 +159,31 @@ int get_parameters(char *service_name, char *exe, int exelen, char *flags, int f return 3; } - /* Try to get flags - may fail */ + /* Try to get flags - may fail and we don't care */ if (expand_parameter(key, NSSM_REG_FLAGS, flags, flagslen)) { - RegCloseKey(key); - return 4; - } - - /* Try to get startup directory - may fail */ - if (expand_parameter(key, NSSM_REG_DIR, dir, dirlen)) { - RegCloseKey(key); - return 5; + log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_FLAGS, NSSM_REG_FLAGS, service_name, exe, 0); + ZeroMemory(flags, flagslen); + } + + /* Try to get startup directory - may fail and we fall back to a default */ + if (expand_parameter(key, NSSM_REG_DIR, dir, dirlen) || ! dir[0]) { + /* Our buffers are defined to be long enough for this to be safe */ + size_t i; + for (i = strlen(exe); i && exe[i] != '\\' && exe[i] != '/'; i--); + if (i) { + memmove(dir, exe, i); + dir[i] = '\0'; + } + else { + /* Help! */ + unsigned long ret = ExpandEnvironmentStrings("%SYSTEMROOT%", dir, dirlen); + if (! ret || ret > dirlen) { + log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_NO_DIR_AND_NO_FALLBACK, NSSM_REG_DIR, service_name, 0); + RegCloseKey(key); + return 4; + } + } + log_event(EVENTLOG_WARNING_TYPE, NSSM_EVENT_NO_DIR, NSSM_REG_DIR, service_name, dir, 0); } /* Close registry */ -- 2.20.1