X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2..d1797eb2b2d5f3aa1b653e6a2562bf79c559eeb2:/sbr/context_replace.c?ds=sidebyside

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 2cdadf0b..1027dcf6 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -1,8 +1,4 @@
-
-/*
- * context_replace.c -- add/replace an entry in the context/profile list
- *
- * $Id$
+/* context_replace.c -- add/replace an entry in the context/profile list
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
@@ -16,15 +12,14 @@
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
+    struct node *np;
 
     /*
-     * If list is emtpy, allocate head of profile/context list.
+     * If list is empty, allocate head of profile/context list.
      */
     if (!m_defs) {
-	m_defs = (struct node *) mh_xmalloc (sizeof(*np));
-
-	np = m_defs;
+	NEW(np);
+        m_defs = np;
 	np->n_name = getcpy (key);
 	np->n_field = getcpy (value);
 	np->n_context = 1;
@@ -38,13 +33,12 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-	if (!strcasecmp (np->n_name, key)) {
+	if (!strcasecmp (FENDNULL(np->n_name), FENDNULL(key))) {
 	    if (strcmp (value, np->n_field)) {
 		if (!np->n_context)
-		    admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
-		if (np->n_field)
-		    free (np->n_field);
-		np->n_field = getcpy (value);
+		    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
+                mh_xfree(np->n_field);
+		np->n_field = mh_xstrdup(value);
 		ctxflags |= CTXMOD;
 	    }
 	    return;
@@ -56,8 +50,7 @@ context_replace (char *key, char *value)
     /*
      * Else add this new entry at the end
      */
-    np->n_next = (struct node *) mh_xmalloc (sizeof(*np));
-
+    NEW(np->n_next);
     np = np->n_next;
     np->n_name = getcpy (key);
     np->n_field = getcpy (value);