lua: fix invocation of foreach() with nil type and implicit self

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

diff --git a/lua/uci.c b/lua/uci.c
index cc6f370..1cb31a5 100644 (file)
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -34,6 +34,28 @@
 #define DPRINTF(...) do {} while (0)
 #endif
 
+#if !defined LUA_VERSION_NUM || LUA_VERSION_NUM==501
+
+/*
+ * ** Adapted from Lua 5.2.0
+ * */
+static void luaL_setfuncs (lua_State *L, const luaL_Reg *l, int nup) {
+       luaL_checkstack(L, nup+1, "too many upvalues");
+       for (; l->name != NULL; l++) {  /* fill the table with given functions */
+               int i;
+               lua_pushstring(L, l->name);
+               for (i = 0; i < nup; i++)  /* copy upvalues to the top */
+                       lua_pushvalue(L, -(nup+1));
+               lua_pushcclosure(L, l->func, nup);  /* closure with those upvalues */
+               lua_settable(L, -(nup + 3));
+       }
+       lua_pop(L, nup);  /* remove upvalues */
+}
+
+#define lua_rawlen(L, i) lua_objlen(L, i)
+
+#endif
+
 static struct uci_context *global_ctx = NULL;
 
 static struct uci_context *
@@ -281,7 +303,7 @@ uci_lua_foreach(lua_State *L)
        ctx = find_context(L, &offset);
        package = luaL_checkstring(L, 1 + offset);
 
-       if (lua_isnil(L, 2))
+       if (lua_isnil(L, 2 + offset))
                type = NULL;
        else
                type = luaL_checkstring(L, 2 + offset);
@@ -364,6 +386,8 @@ uci_lua_get_any(lua_State *L, bool all)
                        err = UCI_ERR_INVAL;
                        goto error;
        }
+       if (s)
+               free(s);
        if (!err)
                return 1;
 
@@ -484,6 +508,8 @@ uci_lua_rename(lua_State *L)
                goto error;
 
 error:
+       if (s)
+               free(s);
        return uci_push_status(L, ctx, false);
 }
 
@@ -533,6 +559,8 @@ uci_lua_reorder(lua_State *L)
                goto error;
 
 error:
+       if (s)
+               free(s);
        return uci_push_status(L, ctx, false);
 }
 
@@ -545,6 +573,7 @@ uci_lua_set(lua_State *L)
        bool istable = false;
        int err = UCI_ERR_MEM;
        char *s = NULL;
+       const char *v;
        int i, nargs, offset = 0;
 
        ctx = find_context(L, &offset);
@@ -559,7 +588,7 @@ uci_lua_set(lua_State *L)
        case 4:
                /* Format: uci.set("p", "s", "o", "v") */
                if (lua_istable(L, nargs)) {
-                       if (lua_objlen(L, nargs) < 1)
+                       if (lua_rawlen(L, nargs) < 1)
                                return luaL_error(L, "Cannot set an uci option to an empty table value");
                        lua_rawgeti(L, nargs, 1);
                        ptr.value = luaL_checkstring(L, -1);
@@ -589,10 +618,16 @@ uci_lua_set(lua_State *L)
        }
 
        if (istable) {
-               if (lua_objlen(L, nargs) == 1) {
+               if (lua_rawlen(L, nargs) == 1) {
                        i = 1;
-                       if (ptr.o)
+                       if (ptr.o) {
+                               v = ptr.value;
+                               ptr.value = NULL;
                                err = uci_delete(ctx, &ptr);
+                               if (err)
+                                       goto error;
+                               ptr.value = v;
+                       }
                } else {
                        i = 2;
                        err = uci_set(ctx, &ptr);
@@ -600,7 +635,7 @@ uci_lua_set(lua_State *L)
                                goto error;
                }
 
-               for (; i <= lua_objlen(L, nargs); i++) {
+               for (; i <= lua_rawlen(L, nargs); i++) {
                        lua_rawgeti(L, nargs, i);
                        ptr.value = luaL_checkstring(L, -1);
                        err = uci_add_list(ctx, &ptr);
@@ -616,6 +651,8 @@ uci_lua_set(lua_State *L)
 
 
 error:
+       if (s)
+               free(s);
        return uci_push_status(L, ctx, false);
 }
 
@@ -665,6 +702,8 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
        }
 
 err:
+       if (s)
+               free(s);
        return uci_push_status(L, ctx, false);
 }
 
@@ -711,24 +750,38 @@ uci_lua_add_change(lua_State *L, struct uci_element *e)
        if (name) {
                lua_getfield(L, -1, name);
 
-               /* there seems to be no value yet */
-               if (lua_isnil(L, -1)) {
-                       /* this delta is a list add operation, initialize table */
-                       if (h->cmd == UCI_CMD_LIST_ADD) {
+               /* this delta is a list add operation */
+               if (h->cmd == UCI_CMD_LIST_ADD) {
+                       /* there seems to be no table yet */
+                       if (!lua_istable(L, -1)) {
                                lua_newtable(L);
-                               lua_pushstring(L, value);
-                               lua_rawseti(L, -2, 1);
+
+                               /* if there is a value on the stack already, add */
+                               if (!lua_isnil(L, -2)) {
+                                       lua_pushvalue(L, -2);
+                                       lua_rawseti(L, -2, 1);
+                                       lua_pushstring(L, value);
+                                       lua_rawseti(L, -2, 2);
+
+                               /* this is the first table item */
+                               } else {
+                                       lua_pushstring(L, value);
+                                       lua_rawseti(L, -2, 1);
+                               }
+
                                lua_setfield(L, -3, name);
+
+                       /* a table is on the top of the stack and this is a subsequent,
+                        * list_add, append this value to table */
                        } else {
                                lua_pushstring(L, value);
-                               lua_setfield(L, -3, name);
+                               lua_rawseti(L, -2, lua_rawlen(L, -2) + 1);
                        }
 
-               /* a table is on the top of the stack so this is a subsequent,
-                * list_add, append this value to table */
-               } else if (lua_istable(L, -1)) {
+               /* non-list change, simply set/replace field */
+               } else {
                        lua_pushstring(L, value);
-                       lua_rawseti(L, -2, lua_objlen(L, -2) + 1);
+                       lua_setfield(L, -3, name);
                }
 
                lua_pop(L, 1);
@@ -849,20 +902,6 @@ uci_lua_add_delta(lua_State *L)
 }
 
 static int
-uci_lua_load_plugins(lua_State *L)
-{
-       struct uci_context *ctx;
-       int offset = 0;
-       const char *str = NULL;
-
-       ctx = find_context(L, &offset);
-       if (lua_isstring(L, -1))
-               str = lua_tostring(L, -1);
-       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;
@@ -931,7 +970,6 @@ static const luaL_Reg uci[] = {
        { "foreach", uci_lua_foreach },
        { "add_history", uci_lua_add_delta },
        { "add_delta", uci_lua_add_delta },
-       { "load_plugins", uci_lua_load_plugins },
        { "get_confdir", uci_lua_get_confdir },
        { "set_confdir", uci_lua_set_confdir },
        { "get_savedir", uci_lua_get_savedir },
@@ -951,11 +989,14 @@ luaopen_uci(lua_State *L)
        lua_setfield(L, -2, "__index");
 
        /* fill metatable */
-       luaL_register(L, NULL, uci);
+       luaL_setfuncs(L, uci, 0);
        lua_pop(L, 1);
 
        /* create module */
-       luaL_register(L, MODNAME, uci);
+       lua_newtable(L);
+       lua_pushvalue(L, -1);
+       luaL_setfuncs(L, uci, 0);
+       lua_setglobal(L, MODNAME);
 
-       return 0;
+       return 1;
 }