From a35712a85c420e24a9c7e9a5eea4fc6d3aff6342 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Tue, 27 Jan 2015 21:10:18 +0300 Subject: [PATCH] server: shutdown command should lead to exit without evaluating the rest Currently openocd -c "echo a1; shutdown; echo a2" outputs both "a1" and "a2" and only then shuts down. This patch fixes it by making shutdown command throw an exception, so unless it's caught the shutdown will behave as expected. Change-Id: I764268b3a9046ff3e9717d04095ea0673f1d755a Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2511 Tested-by: jenkins Reviewed-by: Uwe Bonnes Reviewed-by: Spencer Oliver --- src/server/server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/server.c b/src/server/server.c index 7fbceb19a..9f9f2f1aa 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -589,7 +589,7 @@ COMMAND_HANDLER(handle_shutdown_command) shutdown_openocd = 1; - return ERROR_OK; + return ERROR_COMMAND_CLOSE_CONNECTION; } COMMAND_HANDLER(handle_poll_period_command)