- added myself to copyright on files i remember adding large contributions for over...

[openocd.git] / src / helper / configuration.c

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 9b9c18160b87ebdbdc8c0abfc9bc0db4c14f374b..a8d3bd2270b2c292d49c0e840ace2542dd5a6519 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -36,7 +39,6 @@ static char** config_file_names;
 static size_t num_script_dirs;
 static char** script_search_dirs;
 
-
 void add_script_search_dir (const char *dir)
 {
        num_script_dirs++;
@@ -46,7 +48,7 @@ void add_script_search_dir (const char *dir)
        script_search_dirs[num_script_dirs] = NULL;
 }
 
-void add_config_file_name (const char *cfg)
+void add_config_command (const char *cfg)
 {
        num_config_files++;
        config_file_names = (char **)realloc(config_file_names, (num_config_files+1) * sizeof (char *));
@@ -55,11 +57,13 @@ 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)
+/* return full path or NULL according to search rules */
+char *find_file(const char *file)
 {
        FILE *fp = NULL;
        char **search_dirs = script_search_dirs;
        char *dir;
+       char const *mode="r";
        char full_path[1024];
 
        /* Check absolute and relative to current working dir first.
@@ -77,26 +81,47 @@ FILE *open_file_from_path (command_context_t *cmd_ctx, char *file, char *mode)
                snprintf(full_path, 1024, "%s/%s", dir, file);
                fp = fopen(full_path, mode);
        }
-
+       
        if (fp)
-               command_print(cmd_ctx, "opened %s", full_path);
+       {
+               fclose(fp);
+               LOG_DEBUG("found %s", full_path);
+               return strdup(full_path);
+       }
+       return NULL;
+}
 
-       return fp;
+
+FILE *open_file_from_path (char *file, char *mode)
+{
+       if (mode[0]!='r')
+       {
+               return fopen(file, mode);
+       } else
+       {
+               char *full_path=find_file(file);
+               FILE *fp = NULL;
+               fp = fopen(full_path, mode);
+               free(full_path);
+               return fp;
+       }
 }
 
 int parse_config_file(struct command_context_s *cmd_ctx)
 {
+       int retval;
        char **cfg;
-       FILE *config_file;
 
        if (!config_file_names)
-               add_config_file_name ("script openocd.cfg");
+               add_config_command ("script openocd.cfg");
 
        cfg = config_file_names;
 
        while (*cfg)
        {
-               command_run_line(cmd_ctx, *cfg);
+               retval=command_run_line(cmd_ctx, *cfg);
+               if (retval!=ERROR_OK)
+                       return retval;
                cfg++;
        }