[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-706-g3debd59

[David B. <dbr...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  3debd59c5ec2a91146e1d2781bedf2ab36ee0c6c (commit)
      from  b0858e89c7a7cf761c2f67db835d17840fd830ee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3debd59c5ec2a91146e1d2781bedf2ab36ee0c6c
Author: David Brownell <dbr...@us...>
Date:   Sat Nov 28 23:08:05 2009 -0800

    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 <dbr...@us...>

diff --git a/src/openocd.c b/src/openocd.c
index 629d50a..01e9e79 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;
 

-----------------------------------------------------------------------

Summary of changes:
 src/openocd.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository