X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=json_script.c;h=b5d414d7e83c2f7a6b39b377558dca69a9599841;hp=73c25022e11c8d42e23077c8b08146b28ba30abd;hb=6a75b3b6437d3c98d852c1bca131c8f81646f2f5;hpb=13b5c1d4ca488575ee3dd4726b669f768fad8ffa

diff --git a/json_script.c b/json_script.c
index 73c2502..b5d414d 100644
--- 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)
@@ -345,6 +346,30 @@ static int handle_expr_not(struct json_call *call, struct blob_attr *expr)
 	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[] = {
 	{ "eq", handle_expr_eq },
 	{ "regex", handle_expr_regex },
@@ -352,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
@@ -484,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));
@@ -541,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)
@@ -571,6 +600,8 @@ void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *
 	if (!call.seq)
 		call.seq = ++_seq;
 
+	ctx->abort = false;
+
 	__json_script_run(&call, file, NULL);
 }