From 10fd274cfe5447fec8a4b8d3757787d086952deb Mon Sep 17 00:00:00 2001 From: Alex Austin Date: Fri, 20 Jul 2012 12:58:14 +0000 Subject: [PATCH] Revert "When calling openocd from a shell like this:" This reverts commit e8641695c634109ebf5f1149923971770da1d28a Original premise was wrong. Proper command is "shutdown", not "exit". Change-Id: I07f5fe0dda9c24abe53628da986bfda0e406bb4a Signed-off-by: Alex Austin Reviewed-on: http://openocd.zylin.com/757 Tested-by: jenkins Reviewed-by: Peter Stuge --- src/helper/command.c | 16 ++++++---------- src/helper/log.h | 2 +- src/openocd.c | 2 -- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/helper/command.c b/src/helper/command.c index 868d0952ec..ef0afa2b56 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -118,15 +118,10 @@ static void command_log_capture_finish(struct log_capture_state *state) static int command_retval_set(Jim_Interp *interp, int retval) { int *return_retval = Jim_GetAssocData(interp, "retval"); - if (retval == ERROR_COMMAND_CLOSE_CONNECTION) { - if (return_retval != NULL) - *return_retval = 0; - return JIM_EXIT; - } else { - if (return_retval != NULL) - *return_retval = retval; - return (retval == ERROR_OK) ? JIM_OK : JIM_ERR; - } + if (return_retval != NULL) + *return_retval = retval; + + return (retval == ERROR_OK) ? JIM_OK : JIM_ERR; } extern struct command_context *global_cmd_ctx; @@ -676,7 +671,8 @@ int command_run_line(struct command_context *context, char *line) } return retval; } else if (retcode == JIM_EXIT) { - return ERROR_OK_EXIT; + /* ignore. + * exit(Jim_GetExitCode(interp)); */ } else { const char *result; int reslen; diff --git a/src/helper/log.h b/src/helper/log.h index ad8d24795d..e161a6ea2b 100644 --- a/src/helper/log.h +++ b/src/helper/log.h @@ -138,5 +138,5 @@ extern int debug_level; * make no assumptions about what went wrong and try to handle the problem. */ #define ERROR_FAIL (-4) -#define ERROR_OK_EXIT (-5) + #endif /* LOG_H */ diff --git a/src/openocd.c b/src/openocd.c index d06e2c56e5..048ce85248 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -279,8 +279,6 @@ static int openocd_thread(int argc, char *argv[], struct command_context *cmd_ct return EXIT_FAILURE; ret = parse_config_file(cmd_ctx); - if (ret == ERROR_OK_EXIT) - return ERROR_OK; if (ret != ERROR_OK) return EXIT_FAILURE; -- 2.30.2