lua: add a return code for aborting iteration in uci_foreach

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

diff --git a/lua/uci.c b/lua/uci.c
index 70d0205..d16a0fd 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -297,8 +297,11 @@ uci_lua_foreach(lua_State *L)
 
                lua_pushvalue(L, 3 + offset); /* iterator function */
                uci_push_section(L, s, i - 1);
-               if (lua_pcall(L, 1, 0, 0) == 0)
+               if (lua_pcall(L, 1, 1, 0) == 0) {
                        ret = true;
+                       if (lua_isboolean(L, -1) && !lua_toboolean(L, -1))
+                               break;
+               }
        }
 
 done:
@@ -474,6 +477,55 @@ error:
        return uci_push_status(L, ctx, false);
 }
 
+static int
+uci_lua_reorder(lua_State *L)
+{
+       struct uci_context *ctx;
+       struct uci_ptr ptr;
+       int err = UCI_ERR_MEM;
+       char *s = NULL;
+       int nargs, offset = 0;
+
+       ctx = find_context(L, &offset);
+       nargs = lua_gettop(L);
+       if (lookup_args(L, ctx, offset, &ptr, &s))
+               goto error;
+
+       switch(nargs - offset) {
+       case 1:
+               /* Format: uci.set("p.s=v") or uci.set("p.s=v") */
+               if (ptr.option) {
+                       err = UCI_ERR_INVAL;
+                       goto error;
+               }
+               break;
+       case 3:
+               /* Format: uci.set("p", "s", "v") */
+               ptr.value = ptr.option;
+               ptr.option = NULL;
+               break;
+       default:
+               err = UCI_ERR_INVAL;
+               goto error;
+       }
+
+       err = uci_lookup_ptr(ctx, &ptr, NULL, false);
+       if (err)
+               goto error;
+
+       if ((ptr.s == NULL) || (ptr.value == NULL)) {
+               err = UCI_ERR_INVAL;
+               goto error;
+       }
+
+       err = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
+       if (err)
+               goto error;
+
+error:
+       return uci_push_status(L, ctx, false);
+}
+
 
 static int
 uci_lua_set(lua_State *L)
@@ -765,6 +817,20 @@ uci_lua_add_history(lua_State *L)
 }
 
 static int
+uci_lua_load_plugins(lua_State *L)
+{
+       struct uci_context *ctx;
+       int ret, offset = 0;
+       const char *str = NULL;
+
+       ctx = find_context(L, &offset);
+       if (lua_isstring(L, -1))
+               str = lua_tostring(L, -1);
+       ret = uci_load_plugins(ctx, str);
+       return uci_push_status(L, ctx, false);
+}
+
+static int
 uci_lua_set_savedir(lua_State *L)
 {
        struct uci_context *ctx;
@@ -828,9 +894,11 @@ static const luaL_Reg uci[] = {
        { "delete", uci_lua_delete },
        { "commit", uci_lua_commit },
        { "revert", uci_lua_revert },
+       { "reorder", uci_lua_reorder },
        { "changes", uci_lua_changes },
        { "foreach", uci_lua_foreach },
        { "add_history", uci_lua_add_history },
+       { "load_plugins", uci_lua_load_plugins },
        { "get_confdir", uci_lua_get_confdir },
        { "set_confdir", uci_lua_set_confdir },
        { "get_savedir", uci_lua_get_savedir },