X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Fconfiguration.c;h=49c1c08f73038647f021ab1f3418485745496562;hp=2d84d9e60e3e9feac3b3bfe0fa9bb6b88c02114f;hb=9a8edbfa8bd83d58a1904dfd35a00f9793d99314;hpb=9f8d50bf81f3628b3ff3b57438eeb26faa535221

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 2d84d9e60e..49c1c08f73 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,87 +24,105 @@
 #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;
+static char **config_file_names;
 
 static size_t num_script_dirs;
-static char** script_search_dirs;
+static char **script_search_dirs;
 
-void add_script_search_dir (const char *dir)
+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;
+
+	LOG_DEBUG("adding %s", dir);
 }
 
-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 full_path[1024];
+	char const *mode = "r";
+	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)
-	{
+	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);
 	}
 
-	if (fp)
-		LOG_DEBUG("opened %s", full_path);
+	if (fp) {
+		fclose(fp);
+		LOG_DEBUG("found %s", full_path);
+		return full_path;
+	}
+
+	free(full_path);
 
-	return fp;
+	return NULL;
+}
+
+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);
+		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 parse_config_file(struct command_context *cmd_ctx)
 {
+	int retval;
 	char **cfg;
 
-	if (!config_file_names)
-		add_config_file_name ("script openocd.cfg");
+	if (!config_file_names) {
+		command_run_line(cmd_ctx, "script openocd.cfg");
+		return ERROR_OK;
+	}
 
 	cfg = config_file_names;
 
-	while (*cfg)
-	{
-		command_run_line(cmd_ctx, *cfg);
+	while (*cfg) {
+		retval = command_run_line(cmd_ctx, *cfg);
+		if (retval != ERROR_OK)
+			return retval;
 		cfg++;
 	}