X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/92c3b05ef3e582d64b3cecfc261fdd66ef13a4ef..8f802697c8d9c4fc52e4d0ce4facf643358aac1a:/sbr/context_replace.c?ds=sidebyside

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 0fdd7b4e..eccb472a 100644
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -5,8 +5,11 @@
  * 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
@@ -14,13 +17,15 @@ context_replace (char *key, char *value)
 {
     struct node *np;
 
+    key = FENDNULL(key);
+
     /*
      * 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;
@@ -33,7 +38,7 @@ context_replace (char *key, char *value)
      * this key, and replace its value if found.
      */
     for (np = m_defs;; np = np->n_next) {
-	if (!strcasecmp (FENDNULL(np->n_name), FENDNULL(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);
@@ -52,7 +57,7 @@ context_replace (char *key, char *value)
      */
     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;