From 2858a9f740a49998bf2db1e6379c5c47133aea98 Mon Sep 17 00:00:00 2001 From: oharboe Date: Thu, 10 Jul 2008 18:24:30 +0000 Subject: - added search paths before running tcl/commands.tcl. - improved error handling for missing tcl/commands.tcl git-svn-id: svn://svn.berlios.de/openocd/trunk@785 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/openocd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/openocd.c') diff --git a/src/openocd.c b/src/openocd.c index f4aa4517..c7b18eb2 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -572,7 +572,11 @@ void initJim(void) /* after command line parsing */ void initJim2(void) { - Jim_Eval(interp, "source [find tcl/commands.tcl]"); + if (Jim_Eval(interp, "source [find tcl/commands.tcl]")==JIM_ERR) + { + LOG_ERROR("Can not find tcl/commands.tcl - check installation"); + exit(-1); + } } command_context_t *setup_command_handler(void) @@ -653,11 +657,13 @@ int openocd_main(int argc, char *argv[]) active_cmd_ctx=cfg_cmd_ctx; - if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK) - return EXIT_FAILURE; + add_default_dirs(); initJim2(); - + + if (parse_cmdline_args(cfg_cmd_ctx, argc, argv) != ERROR_OK) + return EXIT_FAILURE; + if (parse_config_file(cfg_cmd_ctx) != ERROR_OK) return EXIT_FAILURE; -- cgit v1.2.3