X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/5dd6771b28c257af405d7248639ed0e3bcdce38b..11e2fb2dbbc074cce78d62fdf425e6bbf1918949:/sbr/context_find.c

diff --git a/sbr/context_find.c b/sbr/context_find.c
index 8c0675f7..ad70f069 100644
--- a/sbr/context_find.c
+++ b/sbr/context_find.c
@@ -11,13 +11,44 @@
 
 
 char *
-context_find (char *str)
+context_find (const char *str)
 {
     struct node *np;
 
     for (np = m_defs; np; np = np->n_next)
-	if (!mh_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;
+}