From e8641695c634109ebf5f1149923971770da1d28a Mon Sep 17 00:00:00 2001 From: Stian Skjelsad Date: Sat, 18 Feb 2012 16:10:19 +0100 Subject: [PATCH] When calling openocd from a shell like this: MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit openocd -f board/sheevaplug.cfg -c init -c exit the calling shell will believe that openocd exited with an error due to exitval will be non-zero This is not tested against incomming telnet Change-Id: I63d15715a7b46f39a7de261a45039f8c3cad7a98 Signed-off-by: Stian Skjelstad Reviewed-on: http://openocd.zylin.com/470 Tested-by: jenkins Reviewed-by: Spencer Oliver Reviewed-by: Bill Traynor Reviewed-by: Mathias Küster Reviewed-by: Freddie Chopin --- src/helper/command.c | 16 ++++++++++------ src/helper/log.h | 2 +- src/openocd.c | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/helper/command.c b/src/helper/command.c index ef0afa2b56..868d0952ec 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -118,10 +118,15 @@ 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 (return_retval != NULL) - *return_retval = retval; - - return (retval == ERROR_OK) ? JIM_OK : JIM_ERR; + 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; + } } extern struct command_context *global_cmd_ctx; @@ -671,8 +676,7 @@ int command_run_line(struct command_context *context, char *line) } return retval; } else if (retcode == JIM_EXIT) { - /* ignore. - * exit(Jim_GetExitCode(interp)); */ + return ERROR_OK_EXIT; } else { const char *result; int reslen; diff --git a/src/helper/log.h b/src/helper/log.h index e161a6ea2b..ad8d24795d 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 048ce85248..d06e2c56e5 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -279,6 +279,8 @@ 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