Andreas Fritiofson <andreas.fritiofson@gmail.com> UTF8 fixes

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

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index fb5b797e4159787286217771b1910d1443162053..3c44d6d470077703ae93efe5224c49d4cef15d0d 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     *
@@ -21,14 +24,9 @@
 #include "config.h"
 #endif
 
-#include "types.h"
-#include "command.h"
 #include "configuration.h"
 #include "log.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
 static size_t num_config_files;
 static char** config_file_names;
@@ -39,32 +37,28 @@ static char** script_search_dirs;
 void add_script_search_dir (const char *dir)
 {
        num_script_dirs++;
-       script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs+1) * sizeof (char *));
+       script_search_dirs = (char **)realloc(script_search_dirs, (num_script_dirs + 1) * sizeof (char *));
 
        script_search_dirs[num_script_dirs-1] = strdup(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 *));
+       config_file_names = (char **)realloc(config_file_names, (num_config_files + 1) * sizeof (char *));
 
        config_file_names[num_config_files-1] = strdup(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.
@@ -84,24 +78,46 @@ FILE *open_file_from_path (char *file, char *mode)
        }
 
        if (fp)
-                       LOG_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);
+               if (full_path == NULL)
+                       return NULL;
+               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++;
        }