Move etc/rmmproc.messageid to fix its install permissions.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index b97162ba09b846ed72e610ed8c803470352dc922..eccb472ac263434121547be1f2e339a1597781bd 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -5,8 +5,11 @@
  * complete copyright information.
  */
 
  * 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
 
 
 void


@@ -14,13 +17,15 @@ context_replace (char *key, char *value)
 {
     struct node *np;
 
 {
     struct node *np;
 

+    key = FENDNULL(key);
+

     /*
      * If list is empty, allocate head of profile/context list.
      */
     if (!m_defs) {
        NEW(np);
         m_defs = np;
     /*
      * If list is empty, allocate head of profile/context list.
      */
     if (!m_defs) {
        NEW(np);
         m_defs = np;

-       np->n_name = getcpy (key);
+       np->n_name = mh_xstrdup(key);

        np->n_field = getcpy (value);
        np->n_context = 1;
        np->n_next = NULL;
        np->n_field = getcpy (value);
        np->n_context = 1;
        np->n_next = NULL;


@@ -33,11 +38,11 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
      * 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)
                    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);
            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
                    inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);

-                mh_xfree(np->n_field);
+                free(np->n_field);

                np->n_field = mh_xstrdup(value);
                ctxflags |= CTXMOD;
            }
                np->n_field = mh_xstrdup(value);
                ctxflags |= CTXMOD;
            }


@@ -52,7 +57,7 @@ context_replace (char *key, char *value)
      */
     NEW(np->n_next);
     np = np->n_next;
      */
     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;
     np->n_field = getcpy (value);
     np->n_context = 1;
     np->n_next = NULL;