X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=lua%2Fuci.c;h=cc6f3704d47b2e9b3dcae196a0b117f5be2bd06e;hp=be0246bf4dbadc3f50e79eb86a6f8344236221e4;hb=359c5c4dcc087413fc01b75a688d7a9c6d4b1c1b;hpb=bb0e4cf86270740be7692a926ab92d2b635a26f8

diff --git a/lua/uci.c b/lua/uci.c
index be0246b..cc6f370 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
@@ -281,7 +287,7 @@ 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)
@@ -554,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);
@@ -640,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;
@@ -648,13 +653,13 @@ 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;
 		}
 	}
@@ -686,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)
@@ -699,12 +705,38 @@ 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 */
+		if (lua_isnil(L, -1)) {
+			/* this delta is a list add operation, initialize table */
+			if (h->cmd == UCI_CMD_LIST_ADD) {
+				lua_newtable(L);
+				lua_pushstring(L, value);
+				lua_rawseti(L, -2, 1);
+				lua_setfield(L, -3, name);
+			} else {
+				lua_pushstring(L, value);
+				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);
 }
 
@@ -757,7 +789,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);
@@ -862,17 +894,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;