Oops, stop showbuildenv reading from stdin when run from a TTY.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index a0c503282cb3896998ffee197d7400c436b21e81..6a270c0f56309d49f894344b6cde76c49d28b6e3 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -14,15 +14,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;
@@ -36,13 +35,13 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-       if (!mh_strcasecmp (np->n_name, key)) {
+       if (!strcasecmp (np->n_name ? np->n_name : "", key ? 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);
+               np->n_field = mh_xstrdup(value);
                ctxflags |= CTXMOD;
            }
            return;
@@ -54,8 +53,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);