diff options
| author | Tomas Vanek <vanekt@fbl.cz> | 2018-02-14 22:53:14 +0100 |
|---|---|---|
| committer | Tomas Vanek <vanekt@fbl.cz> | 2018-03-15 17:08:34 +0000 |
| commit | ae5b30ae960b35187751e9d837d5dc42745d2376 (patch) | |
| tree | 2d90871af7e4fdc329f94a9e29049cbe3025f930 /src | |
| parent | a0b76360b874607f2aa075e764891f129b5ff0f9 (diff) | |
| download | riscv-openocd-ae5b30ae960b35187751e9d837d5dc42745d2376.zip riscv-openocd-ae5b30ae960b35187751e9d837d5dc42745d2376.tar.gz riscv-openocd-ae5b30ae960b35187751e9d837d5dc42745d2376.tar.bz2 | |
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 <vanekt@fbl.cz>
Reviewed-on: http://openocd.zylin.com/4409
Tested-by: jenkins
Diffstat (limited to 'src')
| -rw-r--r-- | src/openocd.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/openocd.c b/src/openocd.c index 05533aa..7394421 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) |