projects
/
project
/
libubox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lua: create a common function for userdata with gc
[project/libubox.git]
/
json_script.c
diff --git
a/json_script.c
b/json_script.c
index 9d5e9d2bf5a4287149e00284fc8924e01ac11978..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[] = {
@@
-416,7
+420,7
@@
static int eval_string(struct json_call *call, struct blob_buf *buf, const char
}
if (cur_var) {
}
if (cur_var) {
- if (
next
> str) {
+ if (
end
> str) {
cur = msg_find_var(call, str);
if (!cur)
continue;
cur = msg_find_var(call, str);
if (!cur)
continue;
@@
-434,7
+438,7
@@
static int eval_string(struct json_call *call, struct blob_buf *buf, const char
cur_len = end - str;
}
cur_len = end - str;
}
- dest = blobmsg_realloc_string_buffer(buf, cur_len + 1);
+ dest = blobmsg_realloc_string_buffer(buf,
len +
cur_len + 1);
memcpy(dest + len, cur, cur_len);
len += cur_len;
}
memcpy(dest + len, cur, cur_len);
len += cur_len;
}
@@
-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);
}
@@
-582,12
+591,17
@@
void json_script_run(struct json_script_ctx *ctx, const char *name,
json_script_run_file(ctx, file, vars);
}
json_script_run_file(ctx, file, vars);
}
-static void __json_script_file_free(struct json_script_
ctx *ctx, struct json_script_
file *f)
+static void __json_script_file_free(struct json_script_file *f)
{
struct json_script_file *next;
{
struct json_script_file *next;
- for (next = f->next; f; f = next, next = f->next)
- free(f);
+ if (!f)
+ return;
+
+ next = f->next;
+ free(f);
+
+ __json_script_file_free(next);
}
void
}
void
@@
-596,7
+610,7
@@
json_script_free(struct json_script_ctx *ctx)
struct json_script_file *f, *next;
avl_remove_all_elements(&ctx->files, f, avl, next)
struct json_script_file *f, *next;
avl_remove_all_elements(&ctx->files, f, avl, next)
- __json_script_file_free(
ctx,
f);
+ __json_script_file_free(f);
blob_buf_free(&ctx->buf);
}
blob_buf_free(&ctx->buf);
}