X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Fconfiguration.c;h=49c1c08f73038647f021ab1f3418485745496562;hb=0e4dee1164005f97f6fe98b38f65917b178f8492;hp=d48977c51288f4a8bf8c84713757552dd0f770c1;hpb=82d2633b5f550115e9e7c7d0520babb6680aa38f;p=openocd.git

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index d48977c512..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,111 +24,107 @@
 #include "config.h"
 #endif
 
-#include "types.h"
-#include "command.h"
 #include "configuration.h"
 #include "log.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-
-char* config_file_name;
+static size_t num_config_files;
+static char **config_file_names;
 
-static int help_flag;
+static size_t num_script_dirs;
+static char **script_search_dirs;
 
-static struct option long_options[] =
+void add_script_search_dir(const char *dir)
 {
-	{"help",			no_argument,	&help_flag, 1},
+	num_script_dirs++;
+	script_search_dirs =
+		(char **)realloc(script_search_dirs, (num_script_dirs + 1) * sizeof(char *));
 
-	{"debug",			optional_argument,	0, 'd'},
-	{"file", 			required_argument,	0, 'f'},
-	{"log_output",		required_argument,	0, 'l'},
-	
-	{0, 0, 0, 0}
-};
+	script_search_dirs[num_script_dirs-1] = strdup(dir);
+	script_search_dirs[num_script_dirs] = NULL;
+
+	LOG_DEBUG("adding %s", dir);
+}
 
-int configuration_output_handler(struct command_context_s *context, char* line)
+void add_config_command(const char *cfg)
 {
-	INFO(line);
-	
-	return ERROR_OK;
+	num_config_files++;
+	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;
 }
 
-int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
+/* return full path or NULL according to search rules */
+char *find_file(const char *file)
 {
-	int c;
-	char command_buffer[128];
-			
-	while (1)
-	{	
-		/* getopt_long stores the option index here. */
-		int option_index = 0;
-		
-		c = getopt_long(argc, argv, "hd::l:f:", long_options, &option_index);
-		
-		/* Detect the end of the options. */
-		if (c == -1)
+	FILE *fp = NULL;
+	char **search_dirs = script_search_dirs;
+	char *dir;
+	char const *mode = "r";
+	char *full_path;
+
+	/* Check absolute and relative to current working dir first.
+	 * This keeps full_path reporting belowing working. */
+	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;
-		
-		switch (c)
-		{
-			case 0:
-				break;
-			case 'h':	/* --help | -h */
-				help_flag = 1;
-				break;
-			case 'f':	/* --file | -f */
-				config_file_name = optarg;
-				break;
-			case 'd':	/* --debug | -d */
-				if (optarg)
-					snprintf(command_buffer, 128, "debug_level %s", optarg);
-				else
-					snprintf(command_buffer, 128, "debug_level 3");
-				command_run_line(cmd_ctx, command_buffer);
-				break;
-			case 'l':	/* --log_output | -l */
-				if (optarg)
-				{
-					snprintf(command_buffer, 128, "log_output %s", optarg);
-					command_run_line(cmd_ctx, command_buffer);
-				}	
-				break;
-		}
+
+		full_path = alloc_printf("%s/%s", dir, file);
+		fp = fopen(full_path, mode);
 	}
 
-	if (help_flag)
-	{
-		printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n");
-		printf("--help       | -h\tdisplay this help\n");
-		printf("--file       | -f\tuse configuration file <name>\n");
-		printf("--debug      | -d\tset debug level <0-3>\n");
-		printf("--log_output | -l\tredirect log output to file <name>\n");
-		exit(-1);
-	}	
+	if (fp) {
+		fclose(fp);
+		LOG_DEBUG("found %s", full_path);
+		return full_path;
+	}
 
-	return ERROR_OK;
+	free(full_path);
+
+	return NULL;
 }
 
-int parse_config_file(struct command_context_s *cmd_ctx)
+FILE *open_file_from_path(const char *file, const char *mode)
 {
-	FILE *config_file;
+	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;
+	}
+}
 
-	if (!config_file_name)
-		config_file_name = "openocd.cfg";
+int parse_config_file(struct command_context *cmd_ctx)
+{
+	int retval;
+	char **cfg;
 
-	config_file = fopen(config_file_name, "r");
-	if (!config_file)
-	{
-		ERROR("couldn't open config file");
-		return ERROR_NO_CONFIG_FILE;
+	if (!config_file_names) {
+		command_run_line(cmd_ctx, "script openocd.cfg");
+		return ERROR_OK;
 	}
 
-	command_run_file(cmd_ctx, config_file, COMMAND_CONFIG);
+	cfg = config_file_names;
 
-	fclose(config_file);
+	while (*cfg) {
+		retval = command_run_line(cmd_ctx, *cfg);
+		if (retval != ERROR_OK)
+			return retval;
+		cfg++;
+	}
 
 	return ERROR_OK;
 }
-