case 2:
ptr->section = luaL_checkstring(L, 2 + offset);
ptr->package = luaL_checkstring(L, 1 + offset);
- if (uci_lookup_ptr(ctx, ptr, NULL, false) != UCI_OK)
+ if (uci_lookup_ptr(ctx, ptr, NULL, true) != UCI_OK)
goto error;
break;
case 1:
- if (uci_lookup_ptr(ctx, ptr, s, false) != UCI_OK)
+ if (uci_lookup_ptr(ctx, ptr, s, true) != UCI_OK)
goto error;
break;
default:
{
struct uci_context *ctx;
struct uci_package *p;
- struct uci_element *e;
+ struct uci_element *e, *tmp;
const char *package, *type;
bool ret = false;
int offset = 0;
if (!p)
goto done;
- uci_foreach_element(&p->sections, e) {
+ uci_foreach_element_safe(&p->sections, tmp, e) {
struct uci_section *s = uci_to_section(e);
i++;
if (lua_isboolean(L, -1) && !lua_toboolean(L, -1))
break;
}
+ else
+ {
+ lua_error(L);
+ break;
+ }
}
done:
if (lookup_args(L, ctx, offset, &ptr, &s))
goto error;
- uci_lookup_ptr(ctx, &ptr, NULL, false);
+ uci_lookup_ptr(ctx, &ptr, NULL, true);
if (!all && !ptr.s) {
err = UCI_ERR_INVAL;
goto error;
goto error;
}
- err = uci_lookup_ptr(ctx, &ptr, NULL, false);
+ err = uci_lookup_ptr(ctx, &ptr, NULL, true);
if (err)
goto error;
goto error;
}
- err = uci_lookup_ptr(ctx, &ptr, NULL, false);
+ err = uci_lookup_ptr(ctx, &ptr, NULL, true);
if (err)
goto error;
goto error;
}
- err = uci_lookup_ptr(ctx, &ptr, NULL, false);
+ err = uci_lookup_ptr(ctx, &ptr, NULL, true);
if (err)
goto error;
if (lookup_args(L, ctx, offset, &ptr, &s))
goto err;
- uci_lookup_ptr(ctx, &ptr, NULL, false);
+ uci_lookup_ptr(ctx, &ptr, NULL, true);
uci_foreach_element_safe(&ctx->root, tmp, e) {
struct uci_package *p = uci_to_package(e);
static void
uci_lua_add_change(lua_State *L, struct uci_element *e)
{
- struct uci_history *h;
+ struct uci_delta *h;
const char *name;
- h = uci_to_history(e);
+ h = uci_to_delta(e);
if (!h->section)
return;
return;
}
- if (uci_list_empty(&p->history) && uci_list_empty(&p->saved_history))
+ if (uci_list_empty(&p->delta) && uci_list_empty(&p->saved_delta))
goto done;
lua_newtable(L);
- uci_foreach_element(&p->saved_history, e) {
+ uci_foreach_element(&p->saved_delta, e) {
uci_lua_add_change(L, e);
}
- uci_foreach_element(&p->history, e) {
+ uci_foreach_element(&p->delta, e) {
uci_lua_add_change(L, e);
}
lua_setfield(L, -2, p->e.name);
}
static int
-uci_lua_add_history(lua_State *L)
+uci_lua_add_delta(lua_State *L)
{
struct uci_context *ctx;
int ret, offset = 0;
ctx = find_context(L, &offset);
luaL_checkstring(L, 1 + offset);
- ret = uci_add_history_path(ctx, lua_tostring(L, -1));
+ ret = uci_add_delta_path(ctx, lua_tostring(L, -1));
return uci_push_status(L, ctx, false);
}
{ "reorder", uci_lua_reorder },
{ "changes", uci_lua_changes },
{ "foreach", uci_lua_foreach },
- { "add_history", uci_lua_add_history },
+ { "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 },