err = UCI_ERR_INVAL;
goto error;
}
+ if (s)
+ free(s);
if (!err)
return 1;
goto error;
error:
+ if (s)
+ free(s);
return uci_push_status(L, ctx, false);
}
goto error;
error:
+ if (s)
+ free(s);
return uci_push_status(L, ctx, false);
}
bool istable = false;
int err = UCI_ERR_MEM;
char *s = NULL;
+ const char *v;
int i, nargs, offset = 0;
ctx = find_context(L, &offset);
if (istable) {
if (lua_objlen(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);
error:
+ if (s)
+ free(s);
return uci_push_status(L, ctx, false);
}
}
err:
+ if (s)
+ free(s);
return uci_push_status(L, ctx, false);
}
{
struct uci_delta *h;
const char *name;
+ const char *value;
h = uci_to_delta(e);
if (!h->section)
lua_setfield(L, -3, h->section);
}
- name = (h->e.name ? h->e.name : ".type");
- if (h->value)
- lua_pushstring(L, h->value);
- else
- lua_pushstring(L, "");
- lua_setfield(L, -2, name);
+ name = h->e.name;
+ value = h->value ? h->value : "";
+
+ if (name) {
+ lua_getfield(L, -1, name);
+
+ /* 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);
+
+ /* 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_rawseti(L, -2, lua_objlen(L, -2) + 1);
+ }
+
+ /* non-list change, simply set/replace field */
+ } else {
+ lua_pushstring(L, value);
+ lua_setfield(L, -3, name);
+ }
+
+ lua_pop(L, 1);
+ } else {
+ lua_pushstring(L, value);
+ lua_setfield(L, -2, ".type");
+ }
+
lua_pop(L, 1);
}
}
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;
{ "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 },