uloop: ignore SIGPIPE by default

[project/libubox.git] / json_script.c

diff --git a/json_script.c b/json_script.c
index a288214..73c2502 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];
+       int ret;
 
        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[] = {
@@ -388,15 +392,14 @@ static int json_process_expr(struct json_call *call, struct blob_attr *cur)
        return ret;
 }
 
-static int cmd_add_string(struct json_call *call, const char *pattern)
+static int eval_string(struct json_call *call, struct blob_buf *buf, const char *name, const char *pattern)
 {
-       struct json_script_ctx *ctx = call->ctx;
        char *dest, *next, *str;
        int len = 0;
        bool var = false;
        char c = '%';
 
-       dest = blobmsg_alloc_string_buffer(&ctx->buf, NULL, 1);
+       dest = blobmsg_alloc_string_buffer(buf, name, 1);
        next = alloca(strlen(pattern) + 1);
        strcpy(next, pattern);
 
@@ -417,7 +420,7 @@ static int cmd_add_string(struct json_call *call, const char *pattern)
                }
 
                if (cur_var) {
-                       if (next > str) {
+                       if (end > str) {
                                cur = msg_find_var(call, str);
                                if (!cur)
                                        continue;
@@ -435,19 +438,37 @@ static int cmd_add_string(struct json_call *call, const char *pattern)
                        cur_len = end - str;
                }
 
-               dest = blobmsg_realloc_string_buffer(&ctx->buf, cur_len + 1);
+               dest = blobmsg_realloc_string_buffer(buf, len + cur_len + 1);
                memcpy(dest + len, cur, cur_len);
                len += cur_len;
        }
 
+       dest[len] = 0;
+       blobmsg_add_string_buffer(buf);
+
        if (var)
                return -1;
 
-       dest[len] = 0;
-       blobmsg_add_string_buffer(&ctx->buf);
        return 0;
 }
 
+static int cmd_add_string(struct json_call *call, const char *pattern)
+{
+       return eval_string(call, &call->ctx->buf, NULL, pattern);
+}
+
+int json_script_eval_string(struct json_script_ctx *ctx, struct blob_attr *vars,
+                           struct blob_buf *buf, const char *name,
+                           const char *pattern)
+{
+       struct json_call call = {
+               .ctx = ctx,
+               .vars = vars,
+       };
+
+       return eval_string(&call, buf, name, pattern);
+}
+
 static int cmd_process_strings(struct json_call *call, struct blob_attr *attr)
 {
        struct json_script_ctx *ctx = call->ctx;
@@ -536,10 +557,9 @@ static int json_process_cmd(struct json_call *call, struct blob_attr *block)
        return 0;
 }
 
-void json_script_run(struct json_script_ctx *ctx, const char *name,
-                    struct blob_attr *vars)
+void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *file,
+                         struct blob_attr *vars)
 {
-       struct json_script_file *file;
        static unsigned int _seq = 0;
        struct json_call call = {
                .ctx = ctx,
@@ -551,19 +571,32 @@ void json_script_run(struct json_script_ctx *ctx, const char *name,
        if (!call.seq)
                call.seq = ++_seq;
 
+       __json_script_run(&call, file, NULL);
+}
+
+void json_script_run(struct json_script_ctx *ctx, const char *name,
+                    struct blob_attr *vars)
+{
+       struct json_script_file *file;
+
        file = json_script_get_file(ctx, name);
        if (!file)
                return;
 
-       __json_script_run(&call, file, NULL);
+       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;
 
-       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
@@ -572,7 +605,7 @@ json_script_free(struct json_script_ctx *ctx)
        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);
 }