From ae5b30ae960b35187751e9d837d5dc42745d2376 Mon Sep 17 00:00:00 2001 From: Tomas Vanek Date: Wed, 14 Feb 2018 22:53:14 +0100 Subject: [PATCH] openocd.c: call server_quit() for cmd line with -c shutdown If OpenOCD command line contains -c shutdown, server_quit() is not called. Though if -c init is also on command line, gdb_server is already initialized. Call server_quit() on both successful and failure exit from command line. Change-Id: I6df41c5df045b61d84a5515d1abaa5dc96bc30ac Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/4409 Tested-by: jenkins --- src/openocd.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/openocd.c b/src/openocd.c index 05533aae..73944216 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -286,10 +286,13 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct return ERROR_FAIL; ret = parse_config_file(cmd_ctx); - if (ret == ERROR_COMMAND_CLOSE_CONNECTION) + if (ret == ERROR_COMMAND_CLOSE_CONNECTION) { + server_quit(); /* gdb server may be initialized by -c init */ return ERROR_OK; - else if (ret != ERROR_OK) + } else if (ret != ERROR_OK) { + server_quit(); /* gdb server may be initialized by -c init */ return ERROR_FAIL; + } ret = server_init(cmd_ctx); if (ERROR_OK != ret) -- 2.39.5