Import release 0.1.2

[secnet.git] / conffile.c

diff --git a/conffile.c b/conffile.c
index c9796fc11e2114a0d8f98f2e976118aa2ac5f742..9e10efa2e3881c36db72afd9223074e72f3351d8 100644 (file)
--- a/conffile.c
+++ b/conffile.c
@@ -379,6 +379,36 @@ static list_t *makelist(closure_t *self, struct cloc loc,
     return r;
 }
 
+/* Take a list consisting of a closure and some other things. Apply the
+   closure to the other things, and return the resulting list */
+static list_t *map(closure_t *self, struct cloc loc, dict_t *context,
+                  list_t *args)
+{
+    list_t *r=NULL, *al;
+    item_t *ci;
+    closure_t *cl;
+    list_t se;
+    
+    ci=list_elem(args,0);
+    if (ci && ci->type==t_closure) {
+       cl=ci->data.closure;
+       if (!cl->apply) {
+           cfgfatal(loc,"map","closure cannot be applied\n");
+       }
+       for (al=args->next; al; al=al->next) {
+           /* Construct a single-element list */
+           se.next=NULL;
+           se.item=al->item;
+           /* Invoke the closure, append its result to the output */
+           r=list_append_list(r,cl->apply(cl,loc,context,&se));
+       }
+    } else {
+       cfgfatal(loc,"map","you must supply a closure as the "
+                "first argument\n");
+    }
+    return r;
+}
+
 /* Read a file and turn it into a string */
 static list_t *readfile(closure_t *self, struct cloc loc,
                        dict_t *context, list_t *args)
@@ -457,6 +487,7 @@ static dict_t *process_config(struct p_node *c)
 
     add_closure(root,"makelist",makelist);
     add_closure(root,"readfile",readfile);
+    add_closure(root,"map",map);
 
     init_builtin_modules(root);
 
@@ -742,6 +773,24 @@ void dict_read_subnet_list(dict_t *dict, string_t key, bool_t required,
     }
 }
 
+uint32_t string_list_to_word(list_t *l, struct flagstr *f, string_t desc)
+{
+    list_t *i;
+    uint32_t r=0;
+    struct flagstr *j;
+
+    for (i=l; i; i=i->next) {
+       if (i->item->type!=t_string) {
+           cfgfatal(i->item->loc,desc,"all elements of list must be "
+                    "strings\n");
+       }
+       for (j=f; j->name; j++)
+           if (strcmp(i->item->data.string,j->name)==0)
+               r|=j->value;
+    }
+    return r;
+}
+
 dict_t *read_conffile(char *name)
 {
     FILE *conffile;