add 2 and 3 argument versions of uci.get()

[project/uci.git] / lua / uci.c

diff --git a/lua/uci.c b/lua/uci.c
index ed3796a..00cfc0e 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -137,24 +137,74 @@ uci_lua_load(lua_State *L)
        return 1;
 }
 
+
+static int
+uci_lua_foreach(lua_State *L)
+{
+       struct uci_package *p;
+       struct uci_element *e;
+       const char *package, *type;
+       bool ret = false;
+
+       package = luaL_checkstring(L, 1);
+
+       if (lua_isnil(L, 2))
+               type = NULL;
+       else
+               type = luaL_checkstring(L, 2);
+
+       if (!lua_isfunction(L, 3) || !package)
+               luaL_error(L, "Invalid argument");
+
+       p = find_package(package);
+       if (!p)
+               goto done;
+
+       uci_foreach_element(&p->sections, e) {
+               struct uci_section *s = uci_to_section(e);
+
+               if (type && (strcmp(s->type, type) != 0))
+                       continue;
+
+               lua_pushvalue(L, 3); /* iterator function */
+               uci_push_section(L, s);
+               if (lua_pcall(L, 1, 0, 0) == 0)
+                       ret = true;
+       }
+
+done:
+       lua_pushboolean(L, ret);
+       return 1;
+}
+
 static int
 uci_lua_get_any(lua_State *L, bool all)
 {
        struct uci_element *e = NULL;
        struct uci_package *p = NULL;
-       char *package = NULL;
-       char *section = NULL;
-       char *option = NULL;
+       const char *package = NULL;
+       const char *section = NULL;
+       const char *option = NULL;
        char *s;
        int err = UCI_ERR_MEM;
+       int n;
+
+       n = lua_gettop(L);
 
        luaL_checkstring(L, 1);
-       s = strdup(lua_tostring(L, -1));
+       s = strdup(lua_tostring(L, 1));
        if (!s)
                goto error;
 
-       if ((err = uci_parse_tuple(ctx, s, &package, &section, &option, NULL)))
-               goto error;
+       if (n > 1) {
+               package = luaL_checkstring(L, 1);
+               section = luaL_checkstring(L, 2);
+               if (n > 2)
+                       option = luaL_checkstring(L, 3);
+       } else {
+               if ((err = uci_parse_tuple(ctx, s, (char **) &package, (char **) &section, (char **) &option, NULL)))
+                       goto error;
+       }
 
        if (!all && (section == NULL)) {
                err = UCI_ERR_INVAL;
@@ -378,6 +428,7 @@ static const luaL_Reg uci[] = {
        { "save", uci_lua_save },
        { "commit", uci_lua_commit },
        { "revert", uci_lua_revert },
+       { "foreach", uci_lua_foreach },
        { "set_confdir", uci_lua_set_confdir },
        { "set_savedir", uci_lua_set_savedir },
        { NULL, NULL },