X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fhelper%2Foptions.c;h=15997a8ba2ca166ba29f4501ba984d81e0dbad27;hb=9cd160608c905db31961d9aaf8d4920fcde7c819;hp=7e738d734042219b7d166536b3012b1bf5926dcd;hpb=a79adf1383e61bd5fe6d90518a4e34b4e3e592bc;p=openocd

diff --git a/src/helper/options.c b/src/helper/options.c
index 7e738d73..15997a8b 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -24,18 +24,12 @@
 #include "config.h"
 #endif
 
-#include "replacements.h"
-
-#include "types.h"
-#include "command.h"
 #include "configuration.h"
 #include "log.h"
+// @todo the inclusion of server.h here is a layering violation
 #include "server.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <getopt.h>
-#include <string.h>
 
 static int help_flag, version_flag;
 
@@ -54,7 +48,7 @@ static struct option long_options[] =
 
 int configuration_output_handler(struct command_context_s *context, const char* line)
 {
-	LOG_USER_N(line);
+	LOG_USER_N("%s", line);
 
 	return ERROR_OK;
 }
@@ -64,7 +58,7 @@ int 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
@@ -74,9 +68,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);
 	}
@@ -94,19 +88,23 @@ 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;
 }
@@ -117,16 +115,16 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 	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:
@@ -158,13 +156,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
@@ -189,7 +187,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)
 	{
@@ -197,6 +195,6 @@ 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);
 	}
-	
+
 	return ERROR_OK;
 }