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

diff --git a/lua/uci.c b/lua/uci.c
index efa8c1a..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
@@ -266,7 +272,7 @@ 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;
@@ -281,13 +287,13 @@ 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++;
@@ -418,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)
@@ -555,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);
@@ -627,7 +632,6 @@ 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);
@@ -642,7 +646,6 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
 
 	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;
@@ -650,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:
@@ -691,6 +691,7 @@ uci_lua_add_change(lua_State *L, struct uci_element *e)
 {
 	struct uci_delta *h;
 	const char *name;
+	const char *value;
 
 	h = uci_to_delta(e);
 	if (!h->section)
@@ -704,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);
 }
 
@@ -762,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);
@@ -793,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);
 }
 
@@ -813,11 +842,11 @@ static int
 uci_lua_add_delta(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_add_delta_path(ctx, lua_tostring(L, -1));
+	uci_add_delta_path(ctx, lua_tostring(L, -1));
 	return uci_push_status(L, ctx, false);
 }
 
@@ -825,13 +854,13 @@ static int
 uci_lua_load_plugins(lua_State *L)
 {
 	struct uci_context *ctx;
-	int ret, offset = 0;
+	int 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);
+	uci_load_plugins(ctx, str);
 	return uci_push_status(L, ctx, false);
 }
 
@@ -839,11 +868,11 @@ 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);
 }
 
@@ -867,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;
@@ -902,6 +931,7 @@ static const luaL_Reg uci[] = {
 	{ "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 },