Added const to last argument of trace_cb signature, it'll be

[nmh] / sbr / context_find.c

diff --git a/sbr/context_find.c b/sbr/context_find.c
index 1e3240134e5426d76f86224fd37c62e58f32b175..ad70f069f9afc62a7e5e7ae448996ff038bcc68b 100644 (file)
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -2,24 +2,53 @@
 /*
  * context_find.c -- find 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.
  */
 
 #include <h/mh.h>
 
 
 char *
-context_find (char *str)
+context_find (const char *str)
 {
     struct node *np;
 
-    /* sanity check - check that context has been read */
-    if (defpath == NULL)
-       adios (NULL, "oops, context hasn't been read yet");
-
     for (np = m_defs; np; np = np->n_next)
-       if (!strcasecmp (np->n_name, str))
+       if (!strcasecmp (np->n_name ? np->n_name : "", str ? str : ""))
            return (np->n_field);
 
     return NULL;
 }
+
+
+/*
+ * Helper function to search first, if subtype is non-NULL, for
+ * invoname-string-type/subtype and then, if not yet found,
+ * invoname-string-type.  If entry is found but is empty, it is
+ * treated as not found.
+ */
+char *
+context_find_by_type (const char *string, const char *type,
+                      const char *subtype) {
+    char *value = NULL;
+
+    if (subtype) {
+        char *cp;
+
+        cp = concat (invo_name, "-", string, "-", type, "/", subtype, NULL);
+        if ((value = context_find (cp)) != NULL && *value == '\0') value = NULL;
+        free (cp);
+    }
+
+    if (value == NULL) {
+        char *cp;
+
+        cp = concat (invo_name, "-", string, "-", type, NULL);
+        if ((value = context_find (cp)) != NULL && *value == '\0') value = NULL;
+        free (cp);
+    }
+
+    return value;
+}