X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=lua%2Fuci.c;h=64e509eb34c0800d8850111bcdfd213ebe8c2750;hp=67ec67181d6804bc875949623d6539dd904b6976;hb=1e1f503d8fb8336da22029faaa1a7252bed22976;hpb=825be5d0cd699919fbad15901c63044f0efffe82

diff --git a/lua/uci.c b/lua/uci.c
index 67ec671..64e509e 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)
@@ -358,6 +364,8 @@ uci_lua_get_any(lua_State *L, bool all)
 			err = UCI_ERR_INVAL;
 			goto error;
 	}
+	if (s)
+		free(s);
 	if (!err)
 		return 1;
 
@@ -478,6 +486,8 @@ uci_lua_rename(lua_State *L)
 		goto error;
 
 error:
+	if (s)
+		free(s);
 	return uci_push_status(L, ctx, false);
 }
 
@@ -527,6 +537,8 @@ uci_lua_reorder(lua_State *L)
 		goto error;
 
 error:
+	if (s)
+		free(s);
 	return uci_push_status(L, ctx, false);
 }
 
@@ -554,7 +566,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);
@@ -610,6 +622,8 @@ uci_lua_set(lua_State *L)
 
 
 error:
+	if (s)
+		free(s);
 	return uci_push_status(L, ctx, false);
 }
 
@@ -659,6 +673,8 @@ uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
 	}
 
 err:
+	if (s)
+		free(s);
 	return uci_push_status(L, ctx, false);
 }
 
@@ -685,6 +701,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)
@@ -698,12 +715,52 @@ 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);
+
+		/* this delta is a list add operation */
+		if (h->cmd == UCI_CMD_LIST_ADD) {
+			/* there seems to be no table yet */
+			if (!lua_istable(L, -1)) {
+				lua_newtable(L);
+
+				/* if there is a value on the stack already, add */
+				if (!lua_isnil(L, -2)) {
+					lua_pushvalue(L, -2);
+					lua_rawseti(L, -2, 1);
+					lua_pushstring(L, value);
+					lua_rawseti(L, -2, 2);
+
+				/* this is the first table item */
+				} else {
+					lua_pushstring(L, value);
+					lua_rawseti(L, -2, 1);
+				}
+
+				lua_setfield(L, -3, name);
+
+			/* a table is on the top of the stack and this is a subsequent,
+			 * list_add, append this value to table */
+			} else {
+				lua_pushstring(L, value);
+				lua_rawseti(L, -2, lua_objlen(L, -2) + 1);
+			}
+
+		/* non-list change, simply set/replace field */
+		} else {
+			lua_pushstring(L, value);
+			lua_setfield(L, -3, name);
+		}
+
+		lua_pop(L, 1);
+	} else {
+		lua_pushstring(L, value);
+		lua_setfield(L, -2, ".type");
+	}
+
 	lua_pop(L, 1);
 }
 
@@ -756,7 +813,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);
@@ -816,20 +873,6 @@ uci_lua_add_delta(lua_State *L)
 }
 
 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;
@@ -861,17 +904,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;
@@ -898,7 +941,6 @@ static const luaL_Reg uci[] = {
 	{ "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 },