uloop: try to use signalfd for signal handling if available

[project/libubox.git] / json_script.c

diff --git a/json_script.c b/json_script.c
index ba1e498..b5d414d 100644 (file)
--- a/json_script.c
+++ b/json_script.c
@@ -32,6 +32,7 @@ struct json_handler {
 
 static int json_process_expr(struct json_call *call, struct blob_attr *cur);
 static int json_process_cmd(struct json_call *call, struct blob_attr *cur);
+static int eval_string(struct json_call *call, struct blob_buf *buf, const char *name, const char *pattern);
 
 struct json_script_file *
 json_script_file_from_blobmsg(const char *name, void *data, int len)
@@ -333,12 +334,40 @@ 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 int handle_expr_isdir(struct json_call *call, struct blob_attr *expr)
+{
+       static struct blob_buf b;
+       struct blob_attr *tb[3];
+       const char *pattern, *path;
+       struct stat s;
+       int ret;
+
+       json_get_tuple(expr, tb, BLOBMSG_TYPE_STRING, 0);
+       if (!tb[1] || blobmsg_type(tb[1]) != BLOBMSG_TYPE_STRING)
+               return -1;
+       pattern = blobmsg_data(tb[1]);
+
+       blob_buf_init(&b, 0);
+       ret = eval_string(call, &b, NULL, pattern);
+       if (ret < 0)
+               return ret;
+       path = blobmsg_data(blob_data(b.head));
+       ret = stat(path, &s);
+       if (ret < 0)
+               return 0;
+       return S_ISDIR(s.st_mode);
 }
 
 static const struct json_handler expr[] = {
@@ -348,6 +377,7 @@ static const struct json_handler expr[] = {
        { "and", handle_expr_and },
        { "or", handle_expr_or },
        { "not", handle_expr_not },
+       { "isdir", handle_expr_isdir },
 };
 
 static int
@@ -416,7 +446,7 @@ static int eval_string(struct json_call *call, struct blob_buf *buf, const char
                }
 
                if (cur_var) {
-                       if (next > str) {
+                       if (end > str) {
                                cur = msg_find_var(call, str);
                                if (!cur)
                                        continue;
@@ -434,7 +464,7 @@ static int eval_string(struct json_call *call, struct blob_buf *buf, const char
                        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;
        }
@@ -480,8 +510,8 @@ static int cmd_process_strings(struct json_call *call, struct blob_attr *attr)
                        continue;
 
                if (blobmsg_type(cur) != BLOBMSG_TYPE_STRING) {
-                       ctx->handle_error(ctx, "Invalid argument in command", attr);
-                       return -1;
+                       blobmsg_add_blob(&ctx->buf, cur);
+                       continue;
                }
 
                ret = cmd_add_string(call, blobmsg_data(cur));
@@ -537,6 +567,9 @@ static int json_process_cmd(struct json_call *call, struct blob_attr *block)
        }
 
        blobmsg_for_each_attr(cur, block, rem) {
+               if (ctx->abort)
+                       break;
+
                switch(blobmsg_type(cur)) {
                case BLOBMSG_TYPE_STRING:
                        if (!i)
@@ -553,10 +586,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,
@@ -568,19 +600,34 @@ void json_script_run(struct json_script_ctx *ctx, const char *name,
        if (!call.seq)
                call.seq = ++_seq;
 
+       ctx->abort = false;
+
+       __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
@@ -589,7 +636,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);
 }