X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=0a74bd8f9600d5dedc395716b39b18c94f3ec731;hb=e200c1086d1f9fbf85d40211d2284d29661c5277;hp=29b4ed2926c0a4d4c82123c0834869320fc99b12;hpb=f9a99d7e21e6df478d81c89176e338db4155ed33;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index 29b4ed2..0a74bd8 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;
   }
@@ -123,10 +124,11 @@ int expand_parameter(HKEY key, char *value, char *data, unsigned long datalen) {
   /* Technically we shouldn't expand environment strings from REG_SZ values */
   if (type != REG_EXPAND_SZ) {
     memmove(data, buffer, buflen);
+    HeapFree(GetProcessHeap(), 0, buffer);
     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 +160,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 */