X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fconfiguration.c;h=74bcc9b0af949d0fbc745f95f22032a8ec5ac7c7;hp=68c863f3253ca9278fdae5330d84063e8a4f78df;hb=0a9daddc2e20d9ff5053a9faf3e1ec11fd600c73;hpb=a78762e786bd21d6fc855e23bf87036369582316

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 68c863f325..74bcc9b0af 100644
--- 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,23 +37,23 @@ 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;
 }
 
 /* return full path or NULL according to search rules */
-char *find_file(char *file)
+char *find_file(const char *file)
 {
 	FILE *fp = NULL;
 	char **search_dirs = script_search_dirs;
@@ -78,7 +76,7 @@ char *find_file(char *file)
 		snprintf(full_path, 1024, "%s/%s", dir, file);
 		fp = fopen(full_path, mode);
 	}
-	
+
 	if (fp)
 	{
 		fclose(fp);
@@ -88,15 +86,16 @@ char *find_file(char *file)
 	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')
 	{
 		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);
@@ -104,18 +103,21 @@ 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_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++;
 	}