X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=registry.cpp;h=93c034d285c41300a0c3654437872dbbe5a72ae5;hb=d1c0d356f6ea58980a33f2fa2da1b6971dd9f909;hp=48783f136b47c4cf22ea8716d9d321fc84c6e7b5;hpb=70c205435a839d0378035071777e8c8384008337;p=nssm.git

diff --git a/registry.cpp b/registry.cpp
index 48783f1..93c034d 100644
--- a/registry.cpp
+++ b/registry.cpp
@@ -260,8 +260,11 @@ int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
     return 2;
   }
 
-  /* Probably not possible */
-  if (! envsize) return 0;
+  /* Minimum usable environment would be A= NULL NULL. */
+  if (envsize < 4 * sizeof(TCHAR)) {
+    *env = 0;
+    return 3;
+  }
 
   /* Previously initialised? */
   if (*env) HeapFree(GetProcessHeap(), 0, *env);
@@ -269,7 +272,7 @@ int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
   *env = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, envsize);
   if (! *env) {
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, value, _T("get_environment()"), 0);
-    return 3;
+    return 4;
   }
 
   /* Actually get the strings. */
@@ -278,11 +281,11 @@ int get_environment(TCHAR *service_name, HKEY key, TCHAR *value, TCHAR **env, un
     log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_QUERYVALUE_FAILED, value, error_string(ret), 0);
     HeapFree(GetProcessHeap(), 0, *env);
     *env = 0;
-    return 4;
+    return 5;
   }
 
   /* Value retrieved by RegQueryValueEx() is SIZE not COUNT. */
-  *envlen = (unsigned long) environment_length(env);
+  *envlen = (unsigned long) environment_length(*env);
 
   return 0;
 }
@@ -441,32 +444,40 @@ int format_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **formatted, unsign
   return 0;
 }
 
-/* Strip CR and replace LF with NULL. */
-int unformat_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **unformatted, unsigned long *newlen) {
+/* Strip CR and replace LF with NULL.  */
+int unformat_double_null(TCHAR *formatted, unsigned long formattedlen, TCHAR **dn, unsigned long *newlen) {
   unsigned long i, j;
   *newlen = 0;
 
-  if (! dnlen) {
-    *unformatted = 0;
+  /* Don't count trailing NULLs. */
+  for (i = 0; i < formattedlen; i++) {
+    if (! formatted[i]) {
+      formattedlen = i;
+      break;
+    }
+  }
+
+  if (! formattedlen) {
+    *dn = 0;
     return 0;
   }
 
-  for (i = 0; i < dnlen; i++) if (dn[i] != _T('\r')) ++*newlen;
+  for (i = 0; i < formattedlen; i++) if (formatted[i] != _T('\r')) ++*newlen;
 
   /* Skip blank lines. */
-  for (i = 0; i < dnlen; i++) {
-    if (dn[i] == _T('\r') && dn[i + 1] == _T('\n')) {
+  for (i = 0; i < formattedlen; i++) {
+    if (formatted[i] == _T('\r') && formatted[i + 1] == _T('\n')) {
       /* This is the last CRLF. */
-      if (i >= dnlen - 2) break;
+      if (i >= formattedlen - 2) break;
 
       /*
         Strip at the start of the block or if the next characters are
         CRLF too.
       */
-      if (! i || (dn[i + 2] == _T('\r') && dn[i + 3] == _T('\n'))) {
-        for (j = i + 2; j < dnlen; j++) dn[j - 2] = dn[j];
-        dn[dnlen--] = _T('\0');
-        dn[dnlen--] = _T('\0');
+      if (! i || (formatted[i + 2] == _T('\r') && formatted[i + 3] == _T('\n'))) {
+        for (j = i + 2; j < formattedlen; j++) formatted[j - 2] = formatted[j];
+        formatted[formattedlen--] = _T('\0');
+        formatted[formattedlen--] = _T('\0');
         i--;
         --*newlen;
       }
@@ -476,19 +487,166 @@ int unformat_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **unformatted, un
   /* Must end with two NULLs. */
   *newlen += 2;
 
-  *unformatted = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
-  if (! *unformatted) return 1;
+  *dn = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *newlen * sizeof(TCHAR));
+  if (! *dn) return 1;
 
-  for (i = 0, j = 0; i < dnlen; i++) {
-    if (dn[i] == _T('\r')) continue;
-    if (dn[i] == _T('\n')) (*unformatted)[j] = _T('\0');
-    else (*unformatted)[j] = dn[i];
+  for (i = 0, j = 0; i < formattedlen; i++) {
+    if (formatted[i] == _T('\r')) continue;
+    if (formatted[i] == _T('\n')) (*dn)[j] = _T('\0');
+    else (*dn)[j] = formatted[i];
     j++;
   }
 
   return 0;
 }
 
+/* Copy a block. */
+int copy_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **newdn) {
+  if (! newdn) return 1;
+
+  *newdn = 0;
+  if (! dn) return 0;
+
+  *newdn = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, dnlen * sizeof(TCHAR));
+  if (! *newdn) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("dn"), _T("copy_double_null()"), 0);
+    return 2;
+  }
+
+  memmove(*newdn, dn, dnlen * sizeof(TCHAR));
+  return 0;
+}
+
+/*
+  Create a new block with all the strings of the first block plus a new string.
+  The new string may be specified as <key> <delimiter> <value> and the keylen
+  gives the offset into the string to compare against existing entries.
+  If the key is already present its value will be overwritten in place.
+  If the key is blank or empty the new block will still be allocated and have
+  non-zero length.
+*/
+int append_to_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **newdn, unsigned long *newlen, TCHAR *append, size_t keylen, bool case_sensitive) {
+  if (! append || ! append[0]) return copy_double_null(dn, dnlen, newdn);
+  size_t appendlen = _tcslen(append);
+  int (*fn)(const TCHAR *, const TCHAR *, size_t) = (case_sensitive) ? _tcsncmp : _tcsnicmp;
+
+  /* Identify the key, if any, or treat the whole string as the key. */
+  TCHAR *key = 0;
+  if (! keylen || keylen > appendlen) keylen = appendlen;
+  key = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (keylen + 1) * sizeof(TCHAR));
+  if (! key) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("key"), _T("append_to_double_null()"), 0);
+    return 1;
+  }
+  memmove(key, append, keylen * sizeof(TCHAR));
+  key[keylen] = _T('\0');
+
+  /* Find the length of the block not including any existing key. */
+  size_t len = 0;
+  TCHAR *s;
+  for (s = dn; *s; s++) {
+    if (fn(s, key, keylen)) len += _tcslen(s) + 1;
+    for ( ; *s; s++);
+  }
+
+  /* Account for new entry. */
+  len += _tcslen(append) + 1;
+
+  /* Account for trailing NULL. */
+  len++;
+
+  /* Allocate a new block. */
+  *newdn = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(TCHAR));
+  if (! *newdn) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("newdn"), _T("append_to_double_null()"), 0);
+    HeapFree(GetProcessHeap(), 0, key);
+    return 2;
+  }
+
+  /* Copy existing entries.*/
+  *newlen = (unsigned long) len;
+  TCHAR *t = *newdn;
+  TCHAR *u;
+  bool replaced = false;
+  for (s = dn; *s; s++) {
+    if (fn(s, key, keylen)) u = s;
+    else {
+      u = append;
+      replaced = true;
+    }
+    len = _tcslen(u) + 1;
+    memmove(t, u, len * sizeof(TCHAR));
+    t += len;
+    for ( ; *s; s++);
+  }
+
+  /* Add the entry if it wasn't already replaced.  The buffer was zeroed. */
+  if (! replaced) memmove(t, append, _tcslen(append) * sizeof(TCHAR));
+
+  HeapFree(GetProcessHeap(), 0, key);
+  return 0;
+}
+
+/*
+  Create a new block with all the string of the first block minus the given
+  string.
+  The keylen parameter gives the offset into the string to compare against
+  existing entries.  If a substring of existing value matches the string to
+  the given length it will be removed.
+  If the last entry is removed the new block will still be allocated and
+  have non-zero length.
+*/
+int remove_from_double_null(TCHAR *dn, unsigned long dnlen, TCHAR **newdn, unsigned long *newlen, TCHAR *remove, size_t keylen, bool case_sensitive) {
+  if (! remove || !remove[0]) return copy_double_null(dn, dnlen, newdn);
+  size_t removelen = _tcslen(remove);
+  int (*fn)(const TCHAR *, const TCHAR *, size_t) = (case_sensitive) ? _tcsncmp : _tcsnicmp;
+
+  /* Identify the key, if any, or treat the whole string as the key. */
+  TCHAR *key = 0;
+  if (! keylen || keylen > removelen) keylen = removelen;
+  key = (TCHAR *) HeapAlloc(GetProcessHeap(), 0, (keylen + 1) * sizeof(TCHAR));
+  if (! key) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("key"), _T("remove_from_double_null()"), 0);
+    return 1;
+  }
+  memmove(key, remove, keylen * sizeof(TCHAR));
+  key[keylen] = _T('\0');
+
+  /* Find the length of the block not including any existing key. */
+  size_t len = 0;
+  TCHAR *s;
+  for (s = dn; *s; s++) {
+    if (fn(s, key, keylen)) len += _tcslen(s) + 1;
+    for ( ; *s; s++);
+  }
+
+  /* Account for trailing NULL. */
+  if (++len < 2) len = 2;
+
+  /* Allocate a new block. */
+  *newdn = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len * sizeof(TCHAR));
+  if (! *newdn) {
+    log_event(EVENTLOG_ERROR_TYPE, NSSM_EVENT_OUT_OF_MEMORY, _T("newdn"), _T("remove_from_double_null()"), 0);
+    HeapFree(GetProcessHeap(), 0, key);
+    return 2;
+  }
+
+  /* Copy existing entries.*/
+  *newlen = (unsigned long) len;
+  TCHAR *t = *newdn;
+  for (s = dn; *s; s++) {
+    if (fn(s, key, keylen)) {
+      len = _tcslen(s) + 1;
+      memmove(t, s, len * sizeof(TCHAR));
+      t += len;
+    }
+    for ( ; *s; s++);
+  }
+
+  HeapFree(GetProcessHeap(), 0, key);
+  return 0;
+}
+
 void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned long *buffer, unsigned long default_value, unsigned long event) {
   unsigned long type = REG_DWORD;
   unsigned long buflen = sizeof(unsigned long);
@@ -509,6 +667,7 @@ void override_milliseconds(TCHAR *service_name, HKEY key, TCHAR *value, unsigned
   if (! ok) *buffer = default_value;
 }
 
+/* Open the key of the service itself Services\<service_name>. */
 HKEY open_service_registry(const TCHAR *service_name, REGSAM sam, bool must_exist) {
   /* Get registry */
   TCHAR registry[KEY_LENGTH];
@@ -520,6 +679,7 @@ HKEY open_service_registry(const TCHAR *service_name, REGSAM sam, bool must_exis
   return open_registry_key(registry, sam, must_exist);
 }
 
+/* Open a subkey of the service Services\<service_name>\<sub>. */
 long open_registry(const TCHAR *service_name, const TCHAR *sub, REGSAM sam, HKEY *key, bool must_exist) {
   /* Get registry */
   TCHAR registry[KEY_LENGTH];