X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fhelper%2Foptions.c;h=203791bd66024fd68c9c70615db2f672e37840c8;hp=6e1f10b7796cd7c49d29a971d969717689fefc26;hb=f7274784a22e975dbab6a8b24770b652a813e64d;hpb=2d48f25dcfc61c23de05b4eb897b17fcae3b9af2 diff --git a/src/helper/options.c b/src/helper/options.c index 6e1f10b779..203791bd66 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -2,6 +2,9 @@ * Copyright (C) 2004, 2005 by Dominic Rath * * Dominic.Rath@gmx.de * * * + * Copyright (C) 2007,2008 Øyvind Harboe * + * oyvind.harboe@zylin.com * + * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * @@ -21,38 +24,71 @@ #include "config.h" #endif +#include "replacements.h" + #include "types.h" #include "command.h" #include "configuration.h" #include "log.h" +#include "server.h" #include #include #include #include -static int help_flag; +static int help_flag, version_flag; static struct option long_options[] = { - {"help", no_argument, &help_flag, 1}, - - {"debug", optional_argument, 0, 'd'}, - {"file", required_argument, 0, 'f'}, - {"search", required_argument, 0, 's'}, - {"log_output", required_argument, 0, 'l'}, - {"command", required_argument, 0, 'c'}, - + {"help", no_argument, &help_flag, 1}, + {"version", no_argument, &version_flag, 1}, + {"debug", optional_argument, 0, 'd'}, + {"file", required_argument, 0, 'f'}, + {"search", required_argument, 0, 's'}, + {"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, char* line) +int configuration_output_handler(struct command_context_s *context, const char* line) { - INFO_SAMELINE(line); + LOG_USER_N(line); return ERROR_OK; } +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: + * bin\openocd.exe + * lib\openocd + * event\at91eb40a_reset.cfg + * target\at91eb40a.cfg + */ + { + 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. + */ + *strrchr(strExePath, '\\')=0; + strcat(strExePath, "\\.."); + 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); +#endif + return ERROR_OK; +} + int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]) { int c; @@ -63,7 +99,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, "hd::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) @@ -76,10 +112,15 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] case 'h': /* --help | -h */ help_flag = 1; break; + case 'v': /* --version | -v */ + version_flag = 1; + break; case 'f': /* --file | -f */ - snprintf(command_buffer, 128, "script %s", optarg); - add_config_file_name(command_buffer); + { + snprintf(command_buffer, 128, "script {%s}", optarg); + add_config_command(command_buffer); break; + } case 's': /* --search | -s */ add_script_search_dir(optarg); break; @@ -100,50 +141,46 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[] case 'c': /* --command | -c */ if (optarg) { - add_config_file_name(optarg); + 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 +#ifdef IS_MINGW + /* pipes currently unsupported on win32 */ + LOG_WARNING("pipes currently unsupported on win32"); + exit(1); +#else + server_use_pipes = 1; +#endif +#endif + break; } } if (help_flag) { - OUTPUT("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n"); - OUTPUT("--help | -h\tdisplay this help\n"); - OUTPUT("--file | -f\tuse configuration file \n"); - OUTPUT("--search | -s\tdir to search for config files and scripts.\n"); - OUTPUT("--debug | -d\tset debug level <0-3>\n"); - OUTPUT("--log_output | -l\tredirect log output to file \n"); - OUTPUT("--command | -c\trun \n"); + LOG_OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n"); + LOG_OUTPUT("--help | -h\tdisplay this help\n"); + LOG_OUTPUT("--version | -v\tdisplay OpenOCD version\n"); + LOG_OUTPUT("--file | -f\tuse configuration file \n"); + LOG_OUTPUT("--search | -s\tdir to search for config files and scripts\n"); + LOG_OUTPUT("--debug | -d\tset debug level <0-3>\n"); + LOG_OUTPUT("--log_output | -l\tredirect log output to file \n"); + LOG_OUTPUT("--command | -c\trun \n"); + LOG_OUTPUT("--pipe | -p\tuse pipes for gdb communication\n"); exit(-1); } -#ifdef _WIN32 - /* Add the parent of the directory where openocd.exe resides to the - * config script search path. - * Directory layout: - * bin\openocd.exe - * lib\openocd - * event\at91eb40a_reset.cfg - * target\at91eb40a.cfg - */ + if (version_flag) { - 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. - */ - *strrchr(strExePath, '\\')=0; - strcat(strExePath, "\\.."); - add_script_search_dir(strExePath); + /* Nothing to do, version gets printed automatically. */ + // It is not an error to request the VERSION number. + exit(0); } -#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); -#endif - + return ERROR_OK; }