From 3d45c47752a36e123895a8b4f7e6b30ac2d0b3a0 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 6 Nov 2015 22:58:15 +0100 Subject: [PATCH] json_script: add support for aborting script processing Signed-off-by: Felix Fietkau --- json_script.c | 5 +++++ json_script.h | 13 +++++++++++++ 2 files changed, 18 insertions(+) diff --git a/json_script.c b/json_script.c index 73c2502..22d8417 100644 --- a/json_script.c +++ b/json_script.c @@ -541,6 +541,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 +574,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); } diff --git a/json_script.h b/json_script.h index 9475baa..66563e9 100644 --- a/json_script.h +++ b/json_script.h @@ -28,6 +28,7 @@ struct json_script_ctx { struct blob_buf buf; uint32_t run_seq; + bool abort; /* * handle_command: handle a command that was not recognized by the @@ -99,6 +100,18 @@ void json_script_run(struct json_script_ctx *ctx, const char *filename, void json_script_run_file(struct json_script_ctx *ctx, struct json_script_file *file, struct blob_attr *vars); + +/* + * json_script_abort - abort current json script run + * + * to be called from a script context callback + */ +static inline void +json_script_abort(struct json_script_ctx *ctx) +{ + ctx->abort = true; +} + /* * json_script_eval_string - evaluate a string and store the result * -- 2.25.1