projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
uci_history -> uci_delta
[project/uci.git]
/
lua
/
uci.c
diff --git
a/lua/uci.c
b/lua/uci.c
index 98f1e15e41e9991858f662b9f0d017e50ad28fbd..efa8c1aef119b2772185c552ea5e61db19ec3116 100644
(file)
--- a/
lua/uci.c
+++ b/
lua/uci.c
@@
-121,11
+121,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);
case 2:
ptr->section = luaL_checkstring(L, 2 + offset);
ptr->package = luaL_checkstring(L, 1 + offset);
- if (uci_lookup_ptr(ctx, ptr, NULL,
fals
e) != UCI_OK)
+ if (uci_lookup_ptr(ctx, ptr, NULL,
tru
e) != UCI_OK)
goto error;
break;
case 1:
goto error;
break;
case 1:
- if (uci_lookup_ptr(ctx, ptr, s,
fals
e) != UCI_OK)
+ if (uci_lookup_ptr(ctx, ptr, s,
tru
e) != UCI_OK)
goto error;
break;
default:
goto error;
break;
default:
@@
-297,8
+297,16
@@
uci_lua_foreach(lua_State *L)
lua_pushvalue(L, 3 + offset); /* iterator function */
uci_push_section(L, s, i - 1);
lua_pushvalue(L, 3 + offset); /* iterator function */
uci_push_section(L, s, i - 1);
- if (lua_pcall(L, 1,
0, 0) == 0)
+ if (lua_pcall(L, 1,
1, 0) == 0) {
ret = true;
ret = true;
+ if (lua_isboolean(L, -1) && !lua_toboolean(L, -1))
+ break;
+ }
+ else
+ {
+ lua_error(L);
+ break;
+ }
}
done:
}
done:
@@
-321,7
+329,7
@@
uci_lua_get_any(lua_State *L, bool all)
if (lookup_args(L, ctx, offset, &ptr, &s))
goto error;
if (lookup_args(L, ctx, offset, &ptr, &s))
goto error;
- uci_lookup_ptr(ctx, &ptr, NULL,
fals
e);
+ uci_lookup_ptr(ctx, &ptr, NULL,
tru
e);
if (!all && !ptr.s) {
err = UCI_ERR_INVAL;
goto error;
if (!all && !ptr.s) {
err = UCI_ERR_INVAL;
goto error;
@@
-457,7
+465,7
@@
uci_lua_rename(lua_State *L)
goto error;
}
goto error;
}
- err = uci_lookup_ptr(ctx, &ptr, NULL,
fals
e);
+ err = uci_lookup_ptr(ctx, &ptr, NULL,
tru
e);
if (err)
goto error;
if (err)
goto error;
@@
-506,7
+514,7
@@
uci_lua_reorder(lua_State *L)
goto error;
}
goto error;
}
- err = uci_lookup_ptr(ctx, &ptr, NULL,
fals
e);
+ err = uci_lookup_ptr(ctx, &ptr, NULL,
tru
e);
if (err)
goto error;
if (err)
goto error;
@@
-566,7
+574,7
@@
uci_lua_set(lua_State *L)
goto error;
}
goto error;
}
- err = uci_lookup_ptr(ctx, &ptr, NULL,
fals
e);
+ err = uci_lookup_ptr(ctx, &ptr, NULL,
tru
e);
if (err)
goto error;
if (err)
goto error;
@@
-630,7
+638,7
@@
uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
if (lookup_args(L, ctx, offset, &ptr, &s))
goto err;
if (lookup_args(L, ctx, offset, &ptr, &s))
goto err;
- uci_lookup_ptr(ctx, &ptr, NULL,
fals
e);
+ uci_lookup_ptr(ctx, &ptr, NULL,
tru
e);
uci_foreach_element_safe(&ctx->root, tmp, e) {
struct uci_package *p = uci_to_package(e);
uci_foreach_element_safe(&ctx->root, tmp, e) {
struct uci_package *p = uci_to_package(e);
@@
-681,10
+689,10
@@
uci_lua_revert(lua_State *L)
static void
uci_lua_add_change(lua_State *L, struct uci_element *e)
{
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 *name;
- h = uci_to_
history
(e);
+ h = uci_to_
delta
(e);
if (!h->section)
return;
if (!h->section)
return;
@@
-720,14
+728,14
@@
uci_lua_changes_pkg(lua_State *L, struct uci_context *ctx, const char *package)
return;
}
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);
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_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);
uci_lua_add_change(L, e);
}
lua_setfield(L, -2, p->e.name);
@@
-802,14
+810,14
@@
uci_lua_get_savedir(lua_State *L)
}
static int
}
static int
-uci_lua_add_
history
(lua_State *L)
+uci_lua_add_
delta
(lua_State *L)
{
struct uci_context *ctx;
int ret, offset = 0;
ctx = find_context(L, &offset);
luaL_checkstring(L, 1 + offset);
{
struct uci_context *ctx;
int ret, offset = 0;
ctx = find_context(L, &offset);
luaL_checkstring(L, 1 + offset);
- ret = uci_add_
history
_path(ctx, lua_tostring(L, -1));
+ ret = uci_add_
delta
_path(ctx, lua_tostring(L, -1));
return uci_push_status(L, ctx, false);
}
return uci_push_status(L, ctx, false);
}
@@
-894,7
+902,7
@@
static const luaL_Reg uci[] = {
{ "reorder", uci_lua_reorder },
{ "changes", uci_lua_changes },
{ "foreach", uci_lua_foreach },
{ "reorder", uci_lua_reorder },
{ "changes", uci_lua_changes },
{ "foreach", uci_lua_foreach },
- { "add_
history", uci_lua_add_history
},
+ { "add_
delta", uci_lua_add_delta
},
{ "load_plugins", uci_lua_load_plugins },
{ "get_confdir", uci_lua_get_confdir },
{ "set_confdir", uci_lua_set_confdir },
{ "load_plugins", uci_lua_load_plugins },
{ "get_confdir", uci_lua_get_confdir },
{ "set_confdir", uci_lua_set_confdir },