X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Foptions.c;h=874196eabc5b82384a7c7c4caf7004617ca99cae;hp=801bd11b2606708ffb981afeef3682596582afe0;hb=4d8d1d32d0f0e0b8866a06cb1d3f304563fa6796;hpb=8a5b25790f064c408d747c9f087c4d45207fc3e4

diff --git a/src/helper/options.c b/src/helper/options.c
index 801bd11b26..874196eabc 100644
--- a/src/helper/options.c
+++ b/src/helper/options.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  *
@@ -25,19 +25,19 @@
 #endif
 
 #include "configuration.h"
-#include "log.h"
+// @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 
 #include <getopt.h>
 
 static int help_flag, version_flag;
 
-static struct option long_options[] =
+static const struct option long_options[] =
 {
 	{"help",	no_argument,		&help_flag,	1},
 	{"version",	no_argument,		&version_flag,	1},
 	{"debug",	optional_argument,	0,		'd'},
-	{"file", 	required_argument,	0,		'f'},
+	{"file",	required_argument,	0,		'f'},
 	{"search",	required_argument,	0,		's'},
 	{"log_output",	required_argument,	0,	'l'},
 	{"command",	required_argument,	0,		'c'},
@@ -45,19 +45,19 @@ static struct option long_options[] =
 	{0, 0, 0, 0}
 };
 
-int configuration_output_handler(struct command_context_s *context, const char* line)
+int configuration_output_handler(struct command_context *context, const char* line)
 {
 	LOG_USER_N("%s", line);
 
 	return ERROR_OK;
 }
 
-int add_default_dirs(void)
+static void add_default_dirs(void)
 {
 #ifdef _WIN32
 	/* Add the parent of the directory where openocd.exe resides to the
 	 * config script search path.
-	 * Directory layout: 
+	 * Directory layout:
 	 * bin\openocd.exe
 	 * lib\openocd
 	 * event\at91eb40a_reset.cfg
@@ -67,9 +67,9 @@ int add_default_dirs(void)
 		char strExePath [MAX_PATH];
 		GetModuleFileName (NULL, strExePath, MAX_PATH);
 		/* Either this code will *always* work or it will SEGFAULT giving
-		 * excellent information on the culprit. 
+		 * excellent information on the culprit.
 		 */
-		*strrchr(strExePath, '\\')=0;
+		*strrchr(strExePath, '\\') = 0;
 		strcat(strExePath, "\\..");
 		add_script_search_dir(strExePath);
 	}
@@ -87,39 +87,42 @@ int add_default_dirs(void)
 		char strExePath [MAX_PATH];
 		char *p;
 		GetModuleFileName (NULL, strExePath, MAX_PATH);
-		*strrchr(strExePath, '\\')=0;
+		*strrchr(strExePath, '\\') = 0;
 		strcat(strExePath, "/../lib/"PACKAGE);
-		for(p=strExePath; *p; p++) {
-			if(*p == '\\')
+		for (p = strExePath; *p; p++) {
+			if (*p == '\\')
 				*p = '/';
 		}
 		add_script_search_dir(strExePath);
 	}
 #else
-	/* Add dir for openocd supplied scripts last so that user can over
-	   ride those scripts if desired. */
-	add_script_search_dir(PKGDATADIR);
-	add_script_search_dir(PKGLIBDIR);
+	/*
+	 * The directory containing OpenOCD-supplied scripts should be
+	 * listed last in the built-in search order, so the user can
+	 * override these scripts with site-specific customizations.
+	 */
+	/// @todo Implement @c add_script_search_dir("${HOME}/.openocd").
+	add_script_search_dir(PKGDATADIR "/site");
+	add_script_search_dir(PKGDATADIR "/scripts");
 #endif
-	return ERROR_OK;
 }
 
-int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[])
+int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 {
 	int c;
 	char command_buffer[128];
 
 	while (1)
-	{	
+	{
 		/* getopt_long stores the option index here. */
 		int option_index = 0;
-		
+
 		c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index);
-		
+
 		/* Detect the end of the options. */
 		if (c == -1)
 			break;
-		
+
 		switch (c)
 		{
 			case 0:
@@ -151,13 +154,13 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 				{
 					snprintf(command_buffer, 128, "log_output %s", optarg);
 					command_run_line(cmd_ctx, command_buffer);
-				}	
+				}
 				break;
 			case 'c':	/* --command | -c */
 				if (optarg)
 				{
 					add_config_command(optarg);
-				}	
+				}
 				break;
 			case 'p':	/* --pipe | -p */
 #if BUILD_ECOSBOARD == 1
@@ -182,7 +185,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 		LOG_OUTPUT("--command    | -c\trun <command>\n");
 		LOG_OUTPUT("--pipe       | -p\tuse pipes for gdb communication\n");
 		exit(-1);
-	}	
+	}
 
 	if (version_flag)
 	{
@@ -190,6 +193,11 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 		// It is not an error to request the VERSION number.
 		exit(0);
 	}
-	
+
+	/* paths specified on the command line take precedence over these
+	 * built-in paths
+	 */
+	add_default_dirs();
+
 	return ERROR_OK;
 }