- fix bug when using full paths to config files. Thanks Ted Roth
git-svn-id: svn://svn.berlios.de/openocd/trunk@314 b42882b7-edfa-0310-969c-e2dbd0fdcd60__archive__
parent
6057fc8ab8
commit
a5ab45af4e
|
@ -81,9 +81,6 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
|
|||
int c;
|
||||
char command_buffer[128];
|
||||
|
||||
/* Always search relative to current working dir first. */
|
||||
add_script_search_dir(".");
|
||||
|
||||
while (1)
|
||||
{
|
||||
/* getopt_long stores the option index here. */
|
||||
|
@ -150,6 +147,11 @@ FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode)
|
|||
char *dir;
|
||||
char full_path[1024];
|
||||
|
||||
/* Check absolute and relative to current working dir first.
|
||||
* This keeps full_path reporting belowing working. */
|
||||
snprintf(full_path, 1024, "%s", file);
|
||||
fp = fopen(full_path, mode);
|
||||
|
||||
while (!fp)
|
||||
{
|
||||
dir = *search_dirs++;
|
||||
|
|
Loading…
Reference in New Issue