Remove X.400 address parsing

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index bceb9dfdecde97f018573b42b75fc3bcc9886507..eccb472ac263434121547be1f2e339a1597781bd 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -1,29 +1,31 @@
-
-/*
- * context_replace.c -- add/replace an entry in the context/profile list
+/* 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
  * complete copyright information.
  */
 
-#include <h/mh.h>
-#include <h/utils.h>
+#include "h/mh.h"
+#include "getcpy.h"
+#include "context_replace.h"
+#include "error.h"
+#include "h/utils.h"
 
 
 void
 context_replace (char *key, char *value)
 {
-    register struct node *np;
+    struct node *np;
+
+    key = FENDNULL(key);
 
     /*
-     * 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;
-       np->n_name = getcpy (key);
+       NEW(np);
+        m_defs = np;
+       np->n_name = mh_xstrdup(key);
        np->n_field = getcpy (value);
        np->n_context = 1;
        np->n_next = NULL;
@@ -36,13 +38,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 ? np->n_name : "", key ? key : "")) {
+       if (!strcasecmp(FENDNULL(np->n_name), 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);
+                free(np->n_field);
+               np->n_field = mh_xstrdup(value);
                ctxflags |= CTXMOD;
            }
            return;
@@ -54,10 +55,9 @@ 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_name = mh_xstrdup(key);
     np->n_field = getcpy (value);
     np->n_context = 1;
     np->n_next = NULL;