X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=blobdiff_plain;f=conffile.c;h=0bd4e33bb3d3f9e5ee4c709e3ca701485ab75377;hp=ede9c49d55eb5c92221525e41d1b9fc936f05477;hb=5c679ae0bf87d5d53b65c5e7667a1fa304bdcdeb;hpb=3f36eb5f9c4635756a38c9327c769599d7b58c1f

diff --git a/conffile.c b/conffile.c
index ede9c49..0bd4e33 100644
--- a/conffile.c
+++ b/conffile.c
@@ -561,10 +561,10 @@ list_t *list_new(void)
     return NULL;
 }
 
-int32_t list_length(list_t *a)
+int32_t list_length(const list_t *a)
 {
     int32_t l=0;
-    list_t *i;
+    const list_t *i;
     for (i=a; i; i=i->next) { assert(l < INT_MAX); l++; }
     return l;
 }
@@ -691,6 +691,31 @@ string_t dict_read_string(dict_t *dict, cstring_t key, bool_t required,
     return r;
 }
 
+const char **dict_read_string_array(dict_t *dict, cstring_t key,
+				    bool_t required, cstring_t desc,
+				    struct cloc loc, const char *const *def)
+{
+    list_t *l;
+    const char **ra, **rap;
+
+    l=dict_lookup(dict,key);
+    if (!l) {
+	if (!required) return (const char**)def;
+	cfgfatal(loc,desc,"required string list \"%s\" not found\n",key);
+    }
+
+    int32_t ll=list_length(l);
+    ra=safe_malloc_ary(sizeof(*ra), ll+1, "dict_read_string_array");
+    for (rap=ra; l; l=l->next,rap++) {
+	item_t *it=l->item;
+	if (it->type!=t_string)
+	    cfgfatal(it->loc,desc,"\"%s\" entry must be a string\n",key);
+	*rap=it->data.string;
+    }
+    *rap=0;
+    return ra;
+}
+
 uint32_t dict_read_number(dict_t *dict, cstring_t key, bool_t required,
 			  cstring_t desc, struct cloc loc, uint32_t def)
 {