[Openocd-svn] r2649 - in trunk/src: . helper

[oharboe at B. <oh...@ma...>]

Author: oharboe
Date: 2009-08-30 19:27:50 +0200 (Sun, 30 Aug 2009)
New Revision: 2649

Modified:
   trunk/src/ecosboard.c
   trunk/src/helper/command.c
   trunk/src/helper/configuration.h
   trunk/src/helper/options.c
Log:
David Brownell <da...@pa...> Be sure the built-in search paths always go *after* ones provided
on the command line ... matching comment in add_default_dirs().

Without this it's impossible to use a private config file which
happens to have the same name as an installed one.  Say, because
you're bugfixing a private copy...

Modified: trunk/src/ecosboard.c
===================================================================
--- trunk/src/ecosboard.c	2009-08-28 17:18:36 UTC (rev 2648)
+++ trunk/src/ecosboard.c	2009-08-30 17:27:50 UTC (rev 2649)
@@ -918,7 +918,7 @@
 
 static const char *zylin_config_dir="/config/settings";
 
-int add_default_dirs(void)
+static int add_default_dirs(void)
 {
 	add_script_search_dir(zylin_config_dir);
 	add_script_search_dir("/rom/lib/openocd");

Modified: trunk/src/helper/command.c
===================================================================
--- trunk/src/helper/command.c	2009-08-28 17:18:36 UTC (rev 2648)
+++ trunk/src/helper/command.c	2009-08-30 17:27:50 UTC (rev 2649)
@@ -744,8 +744,6 @@
 	interp->cb_fflush = openocd_jim_fflush;
 	interp->cb_fgets = openocd_jim_fgets;
 
-	add_default_dirs();
-
 #if !BUILD_ECOSBOARD
 	Jim_EventLoopOnLoad(interp);
 #endif

Modified: trunk/src/helper/configuration.h
===================================================================
--- trunk/src/helper/configuration.h	2009-08-28 17:18:36 UTC (rev 2648)
+++ trunk/src/helper/configuration.h	2009-08-30 17:27:50 UTC (rev 2649)
@@ -32,6 +32,5 @@
 extern int configuration_output_handler(struct command_context_s *context, const char* line);
 extern FILE *open_file_from_path (char *file, char *mode);
 extern char *find_file(const char *name);
-int add_default_dirs(void);
 
 #endif /* CONFIGURATION_H */

Modified: trunk/src/helper/options.c
===================================================================
--- trunk/src/helper/options.c	2009-08-28 17:18:36 UTC (rev 2648)
+++ trunk/src/helper/options.c	2009-08-30 17:27:50 UTC (rev 2649)
@@ -38,7 +38,7 @@
 	{"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'},
@@ -53,7 +53,7 @@
 	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
@@ -106,7 +106,6 @@
 	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[])
@@ -196,5 +195,10 @@
 		exit(0);
 	}
 
+	/* paths specified on the command line take precedence over these
+	 * built-in paths
+	 */
+	add_default_dirs();
+
 	return ERROR_OK;
 }