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:
}
static void
-uci_push_section(lua_State *L, struct uci_section *s)
+uci_push_section(lua_State *L, struct uci_section *s, int index)
{
struct uci_element *e;
lua_setfield(L, -2, ".type");
lua_pushstring(L, s->e.name);
lua_setfield(L, -2, ".name");
+ if (index >= 0) {
+ lua_pushinteger(L, index);
+ lua_setfield(L, -2, ".index");
+ }
uci_foreach_element(&s->options, e) {
struct uci_option *o = uci_to_option(e);
lua_newtable(L);
uci_foreach_element(&p->sections, e) {
- i++;
- uci_push_section(L, uci_to_section(e));
+ uci_push_section(L, uci_to_section(e), i);
lua_setfield(L, -2, e->name);
+ i++;
}
}
const char *package, *type;
bool ret = false;
int offset = 0;
+ int i = 0;
ctx = find_context(L, &offset);
package = luaL_checkstring(L, 1 + offset);
uci_foreach_element(&p->sections, e) {
struct uci_section *s = uci_to_section(e);
+ i++;
+
if (type && (strcmp(s->type, type) != 0))
continue;
lua_pushvalue(L, 3 + offset); /* iterator function */
- uci_push_section(L, s);
- if (lua_pcall(L, 1, 0, 0) == 0)
+ uci_push_section(L, s, i - 1);
+ if (lua_pcall(L, 1, 1, 0) == 0) {
ret = true;
+ 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;
break;
case UCI_TYPE_SECTION:
if (all)
- uci_push_section(L, ptr.s);
+ uci_push_section(L, ptr.s, -1);
else
lua_pushstring(L, ptr.s->type);
break;
}
static int
+uci_lua_rename(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.o=v") or uci.set("p.s=v") */
+ break;
+ case 4:
+ /* Format: uci.set("p", "s", "o", "v") */
+ ptr.value = luaL_checkstring(L, nargs);
+ 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, true);
+ if (err)
+ goto error;
+
+ if (((ptr.s == NULL) && (ptr.option != NULL)) || (ptr.value == NULL)) {
+ err = UCI_ERR_INVAL;
+ goto error;
+ }
+
+ err = uci_rename(ctx, &ptr);
+ if (err)
+ goto error;
+
+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, true);
+ 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)
{
struct uci_context *ctx;
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_set(ctx, &ptr);
- if (err)
- goto error;
-
if (istable) {
- for (i = 2; i <= lua_objlen(L, nargs); i++) {
+ if (lua_objlen(L, nargs) == 1) {
+ i = 1;
+ if (ptr.o)
+ err = uci_delete(ctx, &ptr);
+ } else {
+ i = 2;
+ err = uci_set(ctx, &ptr);
+ if (err)
+ goto error;
+ }
+
+ for (; i <= lua_objlen(L, nargs); i++) {
lua_rawgeti(L, nargs, i);
ptr.value = luaL_checkstring(L, -1);
err = uci_add_list(ctx, &ptr);
if (err)
goto error;
}
+ } else {
+ err = uci_set(ctx, &ptr);
+ if (err)
+ goto error;
}
+
error:
return uci_push_status(L, ctx, false);
}
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_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_delta_path(ctx, lua_tostring(L, -1));
+ return uci_push_status(L, ctx, false);
+}
+
+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;
{ "get_all", uci_lua_get_all },
{ "add", uci_lua_add },
{ "set", uci_lua_set },
+ { "rename", uci_lua_rename },
{ "save", uci_lua_save },
{ "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_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 },
projects / project / uci.git / blobdiff