openocd.c: call server_quit() for cmd line with -c shutdown 09/4409/2
authorTomas Vanek <vanekt@fbl.cz>
Wed, 14 Feb 2018 21:53:14 +0000 (22:53 +0100)
committerTomas Vanek <vanekt@fbl.cz>
Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)
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
src/openocd.c

index 05533aa..7394421 100644 (file)
@@ -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)