diff mbox

[OpenWrt-Devel,libubox,v3,1/2] json_script: add "isdir" support

Message ID 1455695107-20218-1-git-send-email-yszhou4tech@gmail.com
State Accepted
Headers show

Commit Message

Yousong Zhou Feb. 17, 2016, 7:45 a.m. UTC 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 examples/json_script-example.json |  5 +++++
 json_script.c                     | 26 ++++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

Comments

Yousong Zhou Feb. 17, 2016, 7:45 a.m. UTC | #1 
v3:
	- fix typo in defining FILE_STDOUT (it was tests.stderr previously)

v2:
	- return 0 on stat() failure
	- add tests for json_script with utility compiled from examples


Yousong Zhou (2):
  json_script: add "isdir" support
  examples: add shunit2 tests for json_script

 .gitignore                        |    1 +
 examples/json_script-example.c    |    6 +-
 examples/json_script-example.json |    5 +
 examples/json_script-tests.sh     |  287 ++++++++++
 examples/shunit2                  | 1067 +++++++++++++++++++++++++++++++++++++
 json_script.c                     |   26 +
 6 files changed, 1389 insertions(+), 3 deletions(-)
 create mode 100644 examples/json_script-tests.sh
 create mode 100644 examples/shunit2
diff mbox

Patch

diff --git a/examples/json_script-example.json b/examples/json_script-example.json
index 45636b7..5328e59 100644
--- a/examples/json_script-example.json
+++ b/examples/json_script-example.json
@@ -27,6 +27,11 @@ 
     [ "exec_if_or", "%ORVAR%" ]
   ],
 
+  [ "if",
+	[ "isdir", "%ISDIRVAR%" ],
+	[ "exec_isdir", "%ISDIRVAR%" ]
+  ],
+
   [ "return", "foobar" ],
 
   [ "exec_non_reachable", "Arghhh" ]
diff --git a/json_script.c b/json_script.c
index 7cef481..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