X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Foptions.c;h=bbd071fd8191c96c1e88e09718b6c8fd7763ac85;hp=d0a4a70e209c73eb5e6700f820d3df280afae3b1;hb=5479ed42ba30dcc692c696cf1d215278e03ce0be;hpb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee

diff --git a/src/helper/options.c b/src/helper/options.c
index d0a4a70e20..bbd071fd81 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -26,8 +26,8 @@
 #endif
 
 #include "configuration.h"
-/* @todo the inclusion of server.h here is a layering violation */
-#include <server/server.h>
+#include "log.h"
+#include "command.h"
 
 #include <getopt.h>
 
@@ -52,11 +52,29 @@ int configuration_output_handler(struct command_context *context, const char *li
 	return ERROR_OK;
 }
 
+#ifdef _WIN32
+static char *find_suffix(const char *text, const char *suffix)
+{
+	size_t text_len = strlen(text);
+	size_t suffix_len = strlen(suffix);
+
+	if (suffix_len == 0)
+		return (char *)text + text_len;
+
+	if (suffix_len > text_len || strncmp(text + text_len - suffix_len, suffix, suffix_len) != 0)
+		return NULL; /* Not a suffix of text */
+
+	return (char *)text + text_len - suffix_len;
+}
+#endif
+
 static void add_default_dirs(void)
 {
+	const char *run_prefix;
+	char *path;
+
 #ifdef _WIN32
 	char strExePath[MAX_PATH];
-	char *path;
 	GetModuleFileName(NULL, strExePath, MAX_PATH);
 
 	/* Strip executable file name, leaving path */
@@ -68,69 +86,61 @@ static void add_default_dirs(void)
 			*p = '/';
 	}
 
-	/* Add the parent of the directory where openocd.exe resides to the
-	 * config script search path.
-	 *
-	 * bin/openocd.exe
-	 * interface/dummy.cfg
-	 * target/at91eb40a.cfg
-	 */
-	path = alloc_printf("%s%s", strExePath, "/..");
-	if (path) {
-		add_script_search_dir(path);
-		free(path);
-	}
-	/* Add support for the directory layout resulting from a 'make install'.
-	 *
-	 * bin/openocd.exe
-	 * share/openocd/scripts/interface/dummy.cfg
-	 * share/openocd/scripts/target/at91eb40a.cfg
-	 */
-	path = alloc_printf("%s%s", strExePath, "/../share/" PACKAGE "/scripts");
-	if (path) {
-		add_script_search_dir(path);
-		free(path);
-	}
-	/* Add single "scripts" folder to search path for Windows OpenOCD builds that don't use cygwin
-	 *
-	 * bin/openocd.exe
-	 * scripts/interface/dummy.cfg
-	 * scripts/target/at91eb40a.cfg
-	 */
-	path = alloc_printf("%s%s", strExePath, "/../scripts");
-	if (path) {
-		add_script_search_dir(path);
-		free(path);
-	}
+	char *end_of_prefix = find_suffix(strExePath, BINDIR);
+	if (end_of_prefix != NULL)
+		*end_of_prefix = '\0';
+
+	run_prefix = strExePath;
 #else
+	run_prefix = "";
+#endif
+
+	LOG_DEBUG("bindir=%s", BINDIR);
+	LOG_DEBUG("pkgdatadir=%s", PKGDATADIR);
+	LOG_DEBUG("run_prefix=%s", run_prefix);
+
 	/*
 	 * 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.
 	 */
-
 	const char *home = getenv("HOME");
 
 	if (home) {
-		char *path;
-
 		path = alloc_printf("%s/.openocd", home);
-
 		if (path) {
 			add_script_search_dir(path);
 			free(path);
 		}
 	}
+#ifdef _WIN32
+	const char *appdata = getenv("APPDATA");
 
-	add_script_search_dir(PKGDATADIR "/site");
-	add_script_search_dir(PKGDATADIR "/scripts");
+	if (appdata) {
+		path = alloc_printf("%s/OpenOCD", appdata);
+		if (path) {
+			add_script_search_dir(path);
+			free(path);
+		}
+	}
 #endif
+
+	path = alloc_printf("%s%s%s", run_prefix, PKGDATADIR, "/site");
+	if (path) {
+		add_script_search_dir(path);
+		free(path);
+	}
+
+	path = alloc_printf("%s%s%s", run_prefix, PKGDATADIR, "/scripts");
+	if (path) {
+		add_script_search_dir(path);
+		free(path);
+	}
 }
 
 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. */
@@ -153,24 +163,26 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 				break;
 			case 'f':		/* --file | -f */
 			{
-				snprintf(command_buffer, 128, "script {%s}", optarg);
-				add_config_command(command_buffer);
+				char *command = alloc_printf("script {%s}", optarg);
+				add_config_command(command);
+				free(command);
 				break;
 			}
 			case 's':		/* --search | -s */
 				add_script_search_dir(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);
+			{
+				char *command = alloc_printf("debug_level %s", optarg ? optarg : "3");
+				command_run_line(cmd_ctx, command);
+				free(command);
 				break;
+			}
 			case 'l':		/* --log_output | -l */
 				if (optarg) {
-					snprintf(command_buffer, 128, "log_output %s", optarg);
-					command_run_line(cmd_ctx, command_buffer);
+					char *command = alloc_printf("log_output %s", optarg);
+					command_run_line(cmd_ctx, command);
+					free(command);
 				}
 				break;
 			case 'c':		/* --command | -c */