Whoops, turns out I originally ran this test with XOAUTH set. Fix the

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 2cdadf0b9b387514f0a346da40d9a44299a4e0b9..45d5a31d6563cf92c143572d39a401f9f1f39722 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -2,8 +2,6 @@
 /*
  * 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.
  * 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.


@@ -19,7 +17,7 @@ context_replace (char *key, char *value)
     register struct node *np;
 
     /*
     register 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));
      */
     if (!m_defs) {
        m_defs = (struct node *) mh_xmalloc (sizeof(*np));


@@ -38,7 +36,7 @@ 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, 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 (strcmp (value, np->n_field)) {
                if (!np->n_context)
                    admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);