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

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

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index a8d3bd2270b2c292d49c0e840ace2542dd5a6519..3c44d6d470077703ae93efe5224c49d4cef15d0d 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  *
@@ -24,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;
@@ -42,7 +37,7 @@ 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;
@@ -51,7 +46,7 @@ void add_script_search_dir (const char *dir)
 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;
@@ -81,7 +76,7 @@ char *find_file(const char *file)
                snprintf(full_path, 1024, "%s/%s", dir, file);
                fp = fopen(full_path, mode);
        }
-       
+
        if (fp)
        {
                fclose(fp);
@@ -91,7 +86,6 @@ char *find_file(const char *file)
        return NULL;
 }
 
-
 FILE *open_file_from_path (char *file, char *mode)
 {
        if (mode[0]!='r')
@@ -99,7 +93,9 @@ FILE *open_file_from_path (char *file, char *mode)
                return fopen(file, mode);
        } else
        {
-               char *full_path=find_file(file);
+               char *full_path = find_file(file);
+               if (full_path == NULL)
+                       return NULL;
                FILE *fp = NULL;
                fp = fopen(full_path, mode);
                free(full_path);
@@ -119,8 +115,8 @@ int parse_config_file(struct command_context_s *cmd_ctx)
 
        while (*cfg)
        {
-               retval=command_run_line(cmd_ctx, *cfg);
-               if (retval!=ERROR_OK)
+               retval = command_run_line(cmd_ctx, *cfg);
+               if (retval != ERROR_OK)
                        return retval;
                cfg++;
        }