contains8bit(): Don't fetch a byte when start >= end.

[nmh] / sbr / context_replace.c

diff --git a/sbr/context_replace.c b/sbr/context_replace.c
index 99f8ef3a512f644182e1337afe96826bea2a127e..1027dcf6f9d925e1b4990098649620b13e23e3f8 100644 (file)
--- a/sbr/context_replace.c
+++ b/sbr/context_replace.c
@@ -1,6 +1,4 @@
-
-/*
- * 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
  *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for


@@ -35,10 +33,10 @@ 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), FENDNULL(key))) {

            if (strcmp (value, np->n_field)) {
                if (!np->n_context)
            if (strcmp (value, np->n_field)) {
                if (!np->n_context)

-                   admonish (NULL, "bug: context_replace(key=\"%s\",value=\"%s\")", key, value);
+                   inform("bug: context_replace(key=\"%s\",value=\"%s\"), continuing...", key, value);

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