DGNum/libubox
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

json_script: add "isdir" support

Browse source 
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
Yousong Zhou 2016-02-17 15:45:05 +08:00 committed by Felix Fietkau
parent f43da92dd7
commit 02db6d71b6
2 changed files with 31 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
examples/json_script-example.json
View file

@ -27,6 +27,11 @@
[ "exec_if_or", "%ORVAR%" ] [ "exec_if_or", "%ORVAR%" ]
], ],
[ "if",
[ "isdir", "%ISDIRVAR%" ],
[ "exec_isdir", "%ISDIRVAR%" ]
],
[ "return", "foobar" ], [ "return", "foobar" ],
[ "exec_non_reachable", "Arghhh" ] [ "exec_non_reachable", "Arghhh" ]

26
json_script.c
View file

@ -32,6 +32,7 @@ struct json_handler {
static int json_process_expr(struct json_call *call, struct blob_attr *cur); 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 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 * struct json_script_file *
json_script_file_from_blobmsg(const char *name, void *data, int len) 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; 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[] = { static const struct json_handler expr[] = {
{ "eq", handle_expr_eq }, { "eq", handle_expr_eq },
{ "regex", handle_expr_regex }, { "regex", handle_expr_regex },
@ -352,6 +377,7 @@ static const struct json_handler expr[] = {
{ "and", handle_expr_and }, { "and", handle_expr_and },
{ "or", handle_expr_or }, { "or", handle_expr_or },
{ "not", handle_expr_not }, { "not", handle_expr_not },
{ "isdir", handle_expr_isdir },
}; };
static int static int