+ err = UCI_ERR_INVAL;
+ goto error;
+ }
+
+ err = uci_lookup_ptr(ctx, &ptr, NULL, false);
+ 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, 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)
+{
+ struct uci_context *ctx;
+ struct uci_ptr ptr;
+ bool istable = false;
+ int err = UCI_ERR_MEM;
+ char *s = NULL;
+ int i, 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") */
+ if (lua_istable(L, nargs)) {
+ if (lua_objlen(L, nargs) < 1)
+ luaL_error(L, "Cannot set an uci option to an empty table value");
+ lua_rawgeti(L, nargs, 1);
+ ptr.value = luaL_checkstring(L, -1);
+ lua_pop(L, 1);
+ istable = true;
+ } else {
+ 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, false);
+ if (err)
+ goto error;
+
+ if (((ptr.s == NULL) && (ptr.option != NULL)) || (ptr.value == NULL)) {
+ err = UCI_ERR_INVAL;
+ goto error;
+ }
+
+ if (istable) {
+ 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);
+ lua_pop(L, 1);
+ if (err)
+ goto error;
+ }
+ } else {
+ err = uci_set(ctx, &ptr);
+ if (err)
+ goto error;
+ }
+
+
+error:
+ return uci_push_status(L, ctx, false);
+}
+
+enum pkg_cmd {
+ CMD_SAVE,
+ CMD_COMMIT,
+ CMD_REVERT
+};
+
+static int
+uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
+{
+ struct uci_context *ctx;
+ struct uci_element *e, *tmp;
+ struct uci_ptr ptr;
+ char *s = NULL;
+ int failed = 0;
+ int nargs, offset = 0;
+
+ ctx = find_context(L, &offset);
+ nargs = lua_gettop(L);
+ if ((cmd != CMD_REVERT) && (nargs - offset > 1))
+ goto err;
+
+ if (lookup_args(L, ctx, offset, &ptr, &s))
+ goto err;
+
+ uci_lookup_ptr(ctx, &ptr, NULL, false);
+
+ uci_foreach_element_safe(&ctx->root, tmp, e) {
+ struct uci_package *p = uci_to_package(e);
+ int ret = UCI_ERR_INVAL;
+
+ if (ptr.p && (ptr.p != p))
+ continue;
+
+ ptr.p = p;
+ switch(cmd) {
+ case CMD_COMMIT:
+ ret = uci_commit(ctx, &p, false);
+ break;
+ case CMD_SAVE:
+ ret = uci_save(ctx, p);
+ break;
+ case CMD_REVERT:
+ ret = uci_revert(ctx, &ptr);
+ break;
+ }
+
+ if (ret != 0)
+ failed = 1;
+ }
+
+err:
+ return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_save(lua_State *L)
+{
+ return uci_lua_package_cmd(L, CMD_SAVE);
+}
+
+static int
+uci_lua_commit(lua_State *L)
+{
+ return uci_lua_package_cmd(L, CMD_COMMIT);
+}
+
+static int
+uci_lua_revert(lua_State *L)
+{
+ return uci_lua_package_cmd(L, CMD_REVERT);
+}
+
+static void
+uci_lua_add_change(lua_State *L, struct uci_element *e)
+{
+ struct uci_history *h;
+ const char *name;
+
+ h = uci_to_history(e);
+ if (!h->section)
+ return;
+
+ lua_getfield(L, -1, h->section);
+ if (lua_isnil(L, -1)) {
+ lua_pop(L, 1);
+ lua_newtable(L);
+ lua_pushvalue(L, -1); /* copy for setfield */
+ 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);
+ lua_pop(L, 1);
+}
+
+static void
+uci_lua_changes_pkg(lua_State *L, struct uci_context *ctx, const char *package)
+{
+ struct uci_package *p = NULL;
+ struct uci_element *e;
+ bool autoload = false;
+
+ p = find_package(L, ctx, package, false);
+ if (!p) {
+ autoload = true;
+ p = find_package(L, ctx, package, true);
+ if (!p)
+ return;
+ }
+
+ if (uci_list_empty(&p->history) && uci_list_empty(&p->saved_history))
+ goto done;
+
+ lua_newtable(L);
+ uci_foreach_element(&p->saved_history, e) {
+ uci_lua_add_change(L, e);
+ }
+ uci_foreach_element(&p->history, e) {
+ uci_lua_add_change(L, e);
+ }
+ lua_setfield(L, -2, p->e.name);
+
+done:
+ if (autoload)
+ uci_unload(ctx, p);
+}
+
+static int
+uci_lua_changes(lua_State *L)
+{
+ struct uci_context *ctx;
+ const char *package = NULL;
+ char **config = NULL;
+ int nargs;
+ int i, offset = 0;
+
+ ctx = find_context(L, &offset);
+ nargs = lua_gettop(L);
+ switch(nargs - offset) {
+ case 1:
+ package = luaL_checkstring(L, 1 + offset);