Merge branch 'dsp5680xx_cherry' of git://repo.or.cz/openocd/dsp568013 into HEAD

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

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index c1e541cbdc0356d0f2196dbea77c74208e54a392..eedd8a1ca823841305069bcbc83a92c900d536c2 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -2,7 +2,7 @@
  *   Copyright (C) 2004, 2005 by Dominic Rath                              *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
- *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                 *
  *   oyvind.harboe@zylin.com                                               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -41,6 +41,8 @@ void add_script_search_dir (const char *dir)
 
        script_search_dirs[num_script_dirs-1] = strdup(dir);
        script_search_dirs[num_script_dirs] = NULL;
+
+       LOG_DEBUG("adding %s", dir);
 }
 
 void add_config_command (const char *cfg)
@@ -59,21 +61,23 @@ char *find_file(const char *file)
        char **search_dirs = script_search_dirs;
        char *dir;
        char const *mode="r";
-       char full_path[1024];
+       char *full_path;
 
        /* Check absolute and relative to current working dir first.
         * This keeps full_path reporting belowing working. */
-       snprintf(full_path, 1024, "%s", file);
+       full_path = alloc_printf("%s", file);
        fp = fopen(full_path, mode);
 
        while (!fp)
        {
+               free(full_path);
+               full_path = NULL;
                dir = *search_dirs++;
 
                if (!dir)
                        break;
 
-               snprintf(full_path, 1024, "%s/%s", dir, file);
+               full_path = alloc_printf("%s/%s", dir, file);
                fp = fopen(full_path, mode);
        }
 
@@ -81,12 +85,15 @@ char *find_file(const char *file)
        {
                fclose(fp);
                LOG_DEBUG("found %s", full_path);
-               return strdup(full_path);
+               return full_path;
        }
+
+       free(full_path);
+
        return NULL;
 }
 
-FILE *open_file_from_path (char *file, char *mode)
+FILE *open_file_from_path(const char *file, const char *mode)
 {
        if (mode[0]!='r')
        {
@@ -103,13 +110,15 @@ FILE *open_file_from_path (char *file, char *mode)
        }
 }
 
-int parse_config_file(struct command_context_s *cmd_ctx)
+int parse_config_file(struct command_context *cmd_ctx)
 {
        int retval;
        char **cfg;
 
-       if (!config_file_names)
-               add_config_command ("script openocd.cfg");
+       if (!config_file_names) {
+               command_run_line(cmd_ctx, "script openocd.cfg");
+               return ERROR_OK;
+       }
 
        cfg = config_file_names;