From 3debd59c5ec2a91146e1d2781bedf2ab36ee0c6c Mon Sep 17 00:00:00 2001 From: David Brownell Date: Sat, 28 Nov 2009 23:08:05 -0800 Subject: [PATCH] bugfix: 'init' changes state, not main() Code other than main() may invoke "init". When it does so, customized handlers may need to run ... so make sure the command context state is updated before they do so. Signed-off-by: David Brownell --- src/openocd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/openocd.c b/src/openocd.c index 629d50ae8..01e9e79cc 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -109,6 +109,8 @@ COMMAND_HANDLER(handle_init_command) atexit(exit_handler); + command_context_mode(CMD_CTX, COMMAND_EXEC); + if (target_init(CMD_CTX) != ERROR_OK) return ERROR_FAIL; LOG_DEBUG("target init complete"); @@ -267,7 +269,6 @@ int openocd_main(int argc, char *argv[]) if (ret != ERROR_COMMAND_CLOSE_CONNECTION) { - command_context_mode(cmd_ctx, COMMAND_EXEC); if (command_run_line(cmd_ctx, "init") != ERROR_OK) return EXIT_FAILURE;