auracaster/openocd
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added search paths before running tcl/commands.tcl.

Browse Source 
- improved error handling for missing tcl/commands.tcl


git-svn-id: svn://svn.berlios.de/openocd/trunk@785 b42882b7-edfa-0310-969c-e2dbd0fdcd60
This commit is contained in:
oharboe
2008-07-10 18:24:30 +00:00
parent 5a2b824b26
commit 2858a9f740
3 changed files with 41 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/openocd.c
View File

@@ -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;