X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fhelper%2Foptions.c;h=c48939e5a6ef056c472649cffb588e8692d2eae7;hb=e43979e7020ea9d05a3c0a2af444f292eacb6c53;hp=cce77e5a7533e5250c81c56ddb956306c7fdd134;hpb=0cba0d4df3fe120f08945703506f8405760325c9;p=openocd.git

diff --git a/src/helper/options.c b/src/helper/options.c
index cce77e5a75..c48939e5a6 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -24,15 +24,12 @@
 #include "config.h"
 #endif
 
-#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;
 
@@ -43,14 +40,15 @@ static struct option long_options[] =
 	{"debug",	optional_argument,	0,		'd'},
 	{"file", 	required_argument,	0,		'f'},
 	{"search",	required_argument,	0,		's'},
-	{"log_output",	required_argument,	0,		'l'},
+	{"log_output",	required_argument,	0,	'l'},
 	{"command",	required_argument,	0,		'c'},
+	{"pipe",	no_argument,		0,		'p'},
 	{0, 0, 0, 0}
 };
 
 int configuration_output_handler(struct command_context_s *context, const char* line)
 {
-	LOG_USER_N(line);
+	LOG_USER_N("%s", line);
 
 	return ERROR_OK;
 }
@@ -76,11 +74,37 @@ int add_default_dirs(void)
 		strcat(strExePath, "\\..");
 		add_script_search_dir(strExePath);
 	}
+	/*
+	 * Add support for the default (as of 20080121) layout when
+	 * using autotools and cygwin to build native MinGW binary.
+	 * Path separator is converted to UNIX style so that MinGW is
+	 * pleased.
+	 *
+	 * bin/openocd.exe
+	 * lib/openocd/event/at91eb40a_reset.cfg
+	 * lib/openocd/target/at91eb40a.cfg
+	 */
+	{
+		char strExePath [MAX_PATH];
+		char *p;
+		GetModuleFileName (NULL, strExePath, MAX_PATH);
+		*strrchr(strExePath, '\\')=0;
+		strcat(strExePath, "/../lib/"PACKAGE);
+		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;
 }
@@ -95,7 +119,7 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 		/* getopt_long stores the option index here. */
 		int option_index = 0;
 		
-		c = getopt_long(argc, argv, "hvd::l:f:s:c:", long_options, &option_index);
+		c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index);
 		
 		/* Detect the end of the options. */
 		if (c == -1)
@@ -140,7 +164,14 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 					add_config_command(optarg);
 				}	
 				break;
-				
+			case 'p':	/* --pipe | -p */
+#if BUILD_ECOSBOARD == 1
+				/* pipes unsupported on hosted platforms */
+				LOG_WARNING("pipes not supported on this platform");
+#else
+				server_use_pipes = 1;
+#endif
+				break;
 		}
 	}
 
@@ -154,14 +185,16 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
 		LOG_OUTPUT("--debug      | -d\tset debug level <0-3>\n");
 		LOG_OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
 		LOG_OUTPUT("--command    | -c\trun <command>\n");
+		LOG_OUTPUT("--pipe       | -p\tuse pipes for gdb communication\n");
 		exit(-1);
 	}	
 
 	if (version_flag)
 	{
 		/* Nothing to do, version gets printed automatically. */
-		exit(-1);
-	}	
-
+		// It is not an error to request the VERSION number.
+		exit(0);
+	}
+	
 	return ERROR_OK;
 }