X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=lua%2Fuci.c;h=ac04c11ca6dc628584755ca4e5f1b92b9292f3a3;hp=2d81a38b98c95375ac8302231d4d865e365a8a47;hb=ef5f4ae3252cb067db9d73afca3f5f72c72126d0;hpb=493cf35e3fd4771e538fc230a478c417e7810ed4

diff --git a/lua/uci.c b/lua/uci.c
index 2d81a38..ac04c11 100644
--- a/lua/uci.c
+++ b/lua/uci.c
@@ -43,8 +43,10 @@ find_context(lua_State *L, int *offset)
 	if (!lua_isuserdata(L, 1)) {
 		if (!global_ctx) {
 			global_ctx = uci_alloc_context();
-			if (!global_ctx)
+			if (!global_ctx) {
 				luaL_error(L, "failed to allocate UCI context");
+				return NULL;
+			}
 		}
 		if (offset)
 			*offset = 0;
@@ -53,8 +55,10 @@ find_context(lua_State *L, int *offset)
 	if (offset)
 		*offset = 1;
 	ctx = luaL_checkudata(L, 1, METANAME);
-	if (!ctx || !*ctx)
+	if (!ctx || !*ctx) {
 		luaL_error(L, "failed to get UCI context");
+		return NULL;
+	}
 
 	return *ctx;
 }
@@ -70,8 +74,10 @@ find_package(lua_State *L, struct uci_context *ctx, const char *str, bool al)
 	sep = strchr(str, '.');
 	if (sep) {
 		name = malloc(1 + sep - str);
-		if (!name)
+		if (!name) {
 			luaL_error(L, "out of memory");
+			return NULL;
+		}
 		strncpy(name, str, sep - str);
 		name[sep - str] = 0;
 	} else
@@ -121,11 +127,11 @@ lookup_args(lua_State *L, struct uci_context *ctx, int offset, struct uci_ptr *p
 	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:
@@ -185,7 +191,7 @@ uci_push_option(lua_State *L, struct uci_option *o)
 }
 
 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;
 
@@ -196,6 +202,10 @@ uci_push_section(lua_State *L, struct uci_section *s)
 	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);
@@ -212,9 +222,9 @@ uci_push_package(lua_State *L, struct uci_package *p)
 
 	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++;
 	}
 }
 
@@ -262,10 +272,11 @@ uci_lua_foreach(lua_State *L)
 {
 	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;
+	int i = 0;
 
 	ctx = find_context(L, &offset);
 	package = luaL_checkstring(L, 1 + offset);
@@ -276,22 +287,32 @@ uci_lua_foreach(lua_State *L)
 		type = luaL_checkstring(L, 2 + offset);
 
 	if (!lua_isfunction(L, 3 + offset) || !package)
-		luaL_error(L, "Invalid argument");
+		return luaL_error(L, "Invalid argument");
 
 	p = find_package(L, ctx, package, true);
 	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 (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:
@@ -314,7 +335,7 @@ uci_lua_get_any(lua_State *L, bool all)
 	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;
@@ -332,7 +353,7 @@ uci_lua_get_any(lua_State *L, bool all)
 			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;
@@ -343,6 +364,9 @@ uci_lua_get_any(lua_State *L, bool all)
 			err = UCI_ERR_INVAL;
 			goto error;
 	}
+	if (!err)
+		return 1;
+
 error:
 	if (s)
 		free(s);
@@ -400,14 +424,13 @@ uci_lua_delete(lua_State *L)
 	struct uci_ptr ptr;
 	int offset = 0;
 	char *s = NULL;
-	int err = UCI_ERR_NOTFOUND;
 
 	ctx = find_context(L, &offset);
 
 	if (lookup_args(L, ctx, offset, &ptr, &s))
 		goto error;
 
-	err = uci_delete(ctx, &ptr);
+	uci_delete(ctx, &ptr);
 
 error:
 	if (s)
@@ -416,6 +439,105 @@ error:
 }
 
 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;
@@ -438,7 +560,7 @@ uci_lua_set(lua_State *L)
 		/* 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");
+				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);
 			lua_pop(L, 1);
@@ -457,7 +579,7 @@ uci_lua_set(lua_State *L)
 		goto error;
 	}
 
-	err = uci_lookup_ptr(ctx, &ptr, NULL, false);
+	err = uci_lookup_ptr(ctx, &ptr, NULL, true);
 	if (err)
 		goto error;
 
@@ -466,12 +588,19 @@ uci_lua_set(lua_State *L)
 		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);
@@ -479,8 +608,13 @@ uci_lua_set(lua_State *L)
 			if (err)
 				goto error;
 		}
+	} else {
+		err = uci_set(ctx, &ptr);
+		if (err)
+			goto error;
 	}
 
+
 error:
 	return uci_push_status(L, ctx, false);
 }
@@ -498,22 +632,20 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
 	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 > 1))
+	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_lookup_ptr(ctx, &ptr, NULL, true);
 
 	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;
@@ -521,18 +653,15 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
 		ptr.p = p;
 		switch(cmd) {
 		case CMD_COMMIT:
-			ret = uci_commit(ctx, &p, false);
+			uci_commit(ctx, &p, false);
 			break;
 		case CMD_SAVE:
-			ret = uci_save(ctx, p);
+			uci_save(ctx, p);
 			break;
 		case CMD_REVERT:
-			ret = uci_revert(ctx, &ptr);
+			uci_revert(ctx, &ptr);
 			break;
 		}
-
-		if (ret != 0)
-			failed = 1;
 	}
 
 err:
@@ -560,10 +689,11 @@ uci_lua_revert(lua_State *L)
 static void
 uci_lua_add_change(lua_State *L, struct uci_element *e)
 {
-	struct uci_history *h;
+	struct uci_delta *h;
 	const char *name;
+	const char *value;
 
-	h = uci_to_history(e);
+	h = uci_to_delta(e);
 	if (!h->section)
 		return;
 
@@ -575,12 +705,40 @@ uci_lua_add_change(lua_State *L, struct uci_element *e)
 		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);
+
+		/* there seems to be no value yet so simply push it as string */
+		if (lua_isnil(L, -1)) {
+			lua_pushstring(L, value);
+			lua_setfield(L, -3, name);
+
+		/* there is already a value, so this change is a list_add,
+		 * coerce string into one-element array and append new value */
+		} else if (lua_isstring(L, -1)) {
+			lua_newtable(L);
+			lua_pushvalue(L, -2);
+			lua_rawseti(L, -2, 1);
+			lua_pushstring(L, value);
+			lua_rawseti(L, -2, 2);
+			lua_setfield(L, -3, name);
+
+		/* 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)) {
+			lua_pushstring(L, value);
+			lua_rawseti(L, -2, lua_objlen(L, -2) + 1);
+		}
+
+		lua_pop(L, 1);
+	} else {
+		lua_pushstring(L, value);
+		lua_setfield(L, -2, ".type");
+	}
+
 	lua_pop(L, 1);
 }
 
@@ -599,14 +757,14 @@ uci_lua_changes_pkg(lua_State *L, struct uci_context *ctx, const char *package)
 			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);
@@ -633,7 +791,7 @@ uci_lua_changes(lua_State *L)
 	case 0:
 		break;
 	default:
-		luaL_error(L, "invalid argument count");
+		return luaL_error(L, "invalid argument count");
 	}
 
 	lua_newtable(L);
@@ -664,11 +822,11 @@ static int
 uci_lua_set_confdir(lua_State *L)
 {
 	struct uci_context *ctx;
-	int ret, offset = 0;
+	int offset = 0;
 
 	ctx = find_context(L, &offset);
 	luaL_checkstring(L, 1 + offset);
-	ret = uci_set_confdir(ctx, lua_tostring(L, -1));
+	uci_set_confdir(ctx, lua_tostring(L, -1));
 	return uci_push_status(L, ctx, false);
 }
 
@@ -681,14 +839,40 @@ uci_lua_get_savedir(lua_State *L)
 }
 
 static int
+uci_lua_add_delta(lua_State *L)
+{
+	struct uci_context *ctx;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	luaL_checkstring(L, 1 + offset);
+	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 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;
-	int ret, offset = 0;
+	int offset = 0;
 
 	ctx = find_context(L, &offset);
 	luaL_checkstring(L, 1 + offset);
-	ret = uci_set_savedir(ctx, lua_tostring(L, -1));
+	uci_set_savedir(ctx, lua_tostring(L, -1));
 	return uci_push_status(L, ctx, false);
 }
 
@@ -712,17 +896,17 @@ uci_lua_cursor(lua_State *L)
 
 	*u = uci_alloc_context();
 	if (!*u)
-		luaL_error(L, "Cannot allocate UCI context");
+		return luaL_error(L, "Cannot allocate UCI context");
 	switch (argc) {
 		case 2:
 			if (lua_isstring(L, 2) &&
 				(uci_set_savedir(*u, luaL_checkstring(L, 2)) != UCI_OK))
-				luaL_error(L, "Unable to set savedir");
+				return luaL_error(L, "Unable to set savedir");
 			/* fall through */
 		case 1:
 			if (lua_isstring(L, 1) &&
 				(uci_set_confdir(*u, luaL_checkstring(L, 1)) != UCI_OK))
-				luaL_error(L, "Unable to set savedir");
+				return luaL_error(L, "Unable to set savedir");
 			break;
 		default:
 			break;
@@ -739,12 +923,17 @@ static const luaL_Reg uci[] = {
 	{ "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_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 },