From: Felix Fietkau <nbd@openwrt.org>
Date: Fri, 6 Nov 2015 21:58:15 +0000 (+0100)
Subject: json_script: add support for aborting script processing
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=commitdiff_plain;h=3d45c47752a36e123895a8b4f7e6b30ac2d0b3a0

json_script: add support for aborting script processing

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---

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
  *