X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=lua%2Fuci.c;h=00cfc0e0c3bbf7dfcc4de24964dad04e471ae924;hp=3c99d78904bbcbf791c1d896c781fd0c1812f977;hb=3232be5d642dd8dc4e718a3c534a8e413ce0f49b;hpb=c4cecfa593ac06b7ba796e98a95653e4a8ad165d

diff --git a/lua/uci.c b/lua/uci.c
index 3c99d78..00cfc0e 100644
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -14,6 +14,7 @@
 
 #include <sys/types.h>
 #include <sys/time.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -62,6 +63,42 @@ done:
 	lua_pop(L, 2);
 }
 
+static void uci_push_section(lua_State *L, struct uci_section *s)
+{
+	struct uci_element *e;
+
+	lua_newtable(L);
+	lua_pushstring(L, s->type);
+	lua_setfield(L, -2, "type");
+	lua_pushstring(L, s->e.name);
+	lua_setfield(L, -2, "name");
+
+	lua_newtable(L);
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -3, "options");
+
+	uci_foreach_element(&s->options, e) {
+		struct uci_option *o = uci_to_option(e);
+		lua_pushstring(L, o->value);
+		lua_setfield(L, -2, o->e.name);
+	}
+	lua_pop(L, 1);
+}
+
+static void uci_push_package(lua_State *L, struct uci_package *p)
+{
+	struct uci_element *e;
+	int i = 0;
+
+	lua_newtable(L);
+	uci_foreach_element(&p->sections, e) {
+		i++;
+		luaL_setn(L, -1, i);
+		uci_push_section(L, uci_to_section(e));
+		lua_rawseti(L, -2, i);
+	}
+}
+
 static int
 uci_lua_unload(lua_State *L)
 {
@@ -100,26 +137,76 @@ uci_lua_load(lua_State *L)
 	return 1;
 }
 
+
 static int
-uci_lua_get(lua_State *L)
+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 (section == NULL) {
+	if (!all && (section == NULL)) {
 		err = UCI_ERR_INVAL;
 		goto error;
 	}
@@ -130,12 +217,22 @@ uci_lua_get(lua_State *L)
 		goto error;
 	}
 
-	if ((err = uci_lookup(ctx, &e, p, section, option)))
-		goto error;
+	if (section) {
+		if ((err = uci_lookup(ctx, &e, p, section, option)))
+			goto error;
+	} else {
+		e = &p->e;
+	}
 
 	switch(e->type) {
+		case UCI_TYPE_PACKAGE:
+			uci_push_package(L, p);
+			break;
 		case UCI_TYPE_SECTION:
-			lua_pushstring(L, uci_to_section(e)->type);
+			if (all)
+				uci_push_section(L, uci_to_section(e));
+			else
+				lua_pushstring(L, uci_to_section(e)->type);
 			break;
 		case UCI_TYPE_OPTION:
 			lua_pushstring(L, uci_to_option(e)->value);
@@ -161,6 +258,17 @@ error:
 	}
 }
 
+static int
+uci_lua_get(lua_State *L)
+{
+	return uci_lua_get_any(L, false);
+}
+
+static int
+uci_lua_get_all(lua_State *L)
+{
+	return uci_lua_get_any(L, true);
+}
 
 static int
 uci_lua_set(lua_State *L)
@@ -315,10 +423,12 @@ static const luaL_Reg uci[] = {
 	{ "load", uci_lua_load },
 	{ "unload", uci_lua_unload },
 	{ "get", uci_lua_get },
+	{ "get_all", uci_lua_get_all },
 	{ "set", uci_lua_set },
 	{ "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 },