From 3a3fc300141d9e0e6b71729d7fd604aa28447116 Mon Sep 17 00:00:00 2001 From: oharboe Date: Fri, 29 Feb 2008 11:31:49 +0000 Subject: - clean up target output strings a bit - open_file_from_path() now uses logging feature - open_file_from_path() no longer uses paths for anything but "r" mode. Fixes bug waiting to happen. git-svn-id: svn://svn.berlios.de/openocd/trunk@389 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/helper/configuration.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/helper/configuration.c') diff --git a/src/helper/configuration.c b/src/helper/configuration.c index abbcbfcb..d7255606 100644 --- a/src/helper/configuration.c +++ b/src/helper/configuration.c @@ -54,8 +54,14 @@ void add_config_file_name (const char *cfg) config_file_names[num_config_files] = NULL; } -FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode) +FILE *open_file_from_path (char *file, char *mode) { + if (mode[0]!='r') + { + return fopen(file, mode); + } else + { + FILE *fp = NULL; char **search_dirs = script_search_dirs; char *dir; @@ -78,9 +84,10 @@ FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode) } if (fp) - command_print(cmd_ctx, "opened %s", full_path); + DEBUG("opened %s", full_path); return fp; + } } int parse_config_file(struct command_context_s *cmd_ctx) -- cgit v1.2.3