projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libubox: lua: use pkg-config built in module to search for alternatives
[project/libubox.git]
/
json_script.c
diff --git
a/json_script.c
b/json_script.c
index 8e7f5265ed4d42e9a784b6bcef14b818e6bebe78..7cef481b64f5618f7eb53f0f440428d0f0b0322b 100644
(file)
--- a/
json_script.c
+++ b/
json_script.c
@@
-333,12
+333,16
@@
static int handle_expr_or(struct json_call *call, struct blob_attr *expr)
static int handle_expr_not(struct json_call *call, struct blob_attr *expr)
{
struct blob_attr *tb[3];
static int handle_expr_not(struct json_call *call, struct blob_attr *expr)
{
struct blob_attr *tb[3];
+ int ret;
json_get_tuple(expr, tb, BLOBMSG_TYPE_ARRAY, 0);
if (!tb[1])
return -1;
json_get_tuple(expr, tb, BLOBMSG_TYPE_ARRAY, 0);
if (!tb[1])
return -1;
- return json_process_expr(call, tb[1]);
+ ret = json_process_expr(call, tb[1]);
+ if (ret < 0)
+ return ret;
+ return !ret;
}
static const struct json_handler expr[] = {
}
static const struct json_handler expr[] = {
@@
-480,8
+484,8
@@
static int cmd_process_strings(struct json_call *call, struct blob_attr *attr)
continue;
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) {
continue;
if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) {
-
ctx->handle_error(ctx, "Invalid argument in command", att
r);
-
return -1
;
+
blobmsg_add_blob(&ctx->buf, cu
r);
+
continue
;
}
ret = cmd_add_string(call, blobmsg_data(cur));
}
ret = cmd_add_string(call, blobmsg_data(cur));
@@
-537,6
+541,9
@@
static int json_process_cmd(struct json_call *call, struct blob_attr *block)
}
blobmsg_for_each_attr(cur, block, rem) {
}
blobmsg_for_each_attr(cur, block, rem) {
+ if (ctx->abort)
+ break;
+
switch(blobmsg_type(cur)) {
case BLOBMSG_TYPE_STRING:
if (!i)
switch(blobmsg_type(cur)) {
case BLOBMSG_TYPE_STRING:
if (!i)
@@
-567,6
+574,8
@@
void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *
if (!call.seq)
call.seq = ++_seq;
if (!call.seq)
call.seq = ++_seq;
+ ctx->abort = false;
+
__json_script_run(&call, file, NULL);
}
__json_script_run(&call, file, NULL);
}
@@
-592,8
+601,7
@@
static void __json_script_file_free(struct json_script_file *f)
next = f->next;
free(f);
next = f->next;
free(f);
- if (next)
- return __json_script_file_free(next);
+ __json_script_file_free(next);
}
void
}
void