jim license cleanup

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

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index d72556060bb738935299539481d6b2b67b27276f..6c2bf474c93ea13b9f9e7ac4441e86c1183675f9 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -45,7 +45,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 *));
@@ -54,17 +54,13 @@ void add_config_file_name (const char *cfg)
        config_file_names[num_config_files] = NULL;
 }
 
-FILE *open_file_from_path (char *file, char *mode)
+/* return full path or NULL according to search rules */
+char *find_file(const char *file)
 {
-       if (mode[0]!='r')
-       {
-               return fopen(file, mode);
-       } else
-       {
-               
        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.
@@ -82,26 +78,47 @@ FILE *open_file_from_path (char *file, char *mode)
                snprintf(full_path, 1024, "%s/%s", dir, file);
                fp = fopen(full_path, mode);
        }
-
+       
        if (fp)
-                       DEBUG("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;
 
        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++;
        }