test/getcwidth: Expand --dump beyond Unicode's BMP.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 435127b263e8c1276bbfd753f0a86a1cda3cfc53..1027dcf6f9d925e1b4990098649620b13e23e3f8 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -1,30 +1,25 @@
-
-/*
- * context_replace.c -- add/replace an entry in the context/profile list
+/* context_replace.c -- add/replace an entry in the context/profile list
  *
- * $Id$
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
+#include <h/utils.h>
 
 
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
-
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-       adios (NULL, "oops, context hasn't been read yet");
+    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) {
-       if (!(m_defs = (struct node *) malloc (sizeof(*np))))
-           adios (NULL, "unable to allocate profile storage");
-
-       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,10 +50,7 @@ context_replace (char *key, char *value)
     /*
      * Else add this new entry at the end
      */
-    np->n_next = (struct node *) malloc (sizeof(*np));
-    if (!np->n_next)
-       adios (NULL, "unable to allocate profile storage");
-
+    NEW(np->n_next);
     np = np->n_next;
     np->n_name = getcpy (key);
     np->n_field = getcpy (value);