X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fhelper%2Foptions.c;h=573026a6e39f7396ce5e2b21b683810587e3575a;hb=1dd5277ba3eb8c5938832b41c2bf6cb5bf19146e;hp=b6b2c6dcc9302e882655f9c518ffb8b57e9d19ab;hpb=e482118106c63edd3c9f6647e4232e90b4c16066;p=openocd.git diff --git a/src/helper/options.c b/src/helper/options.c index b6b2c6dcc9..573026a6e3 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -1,132 +1,218 @@ -/*************************************************************************** - * Copyright (C) 2004, 2005 by Dominic Rath * - * Dominic.Rath@gmx.de * - * * - * 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 * - * (at your option) any later version. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the * - * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - ***************************************************************************/ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "types.h" -#include "command.h" -#include "configuration.h" -#include "log.h" - -#include -#include -#include -#include - - -static int help_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'}, - - {0, 0, 0, 0} -}; - - - -int configuration_output_handler(struct command_context_s *context, char* line) -{ - INFO(line); - - return ERROR_OK; -} - - -int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]) -{ - int c; - char command_buffer[128]; - - while (1) - { - /* 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); - - /* Detect the end of the options. */ - if (c == -1) - break; - - switch (c) - { - case 0: - break; - case 'h': /* --help | -h */ - help_flag = 1; - break; - case 'f': /* --file | -f */ - snprintf(command_buffer, 128, "script %s", optarg); - add_config_file_name(command_buffer); - 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); - break; - case 'l': /* --log_output | -l */ - if (optarg) - { - snprintf(command_buffer, 128, "log_output %s", optarg); - command_run_line(cmd_ctx, command_buffer); - } - break; - case 'c': /* --command | -c */ - if (optarg) - { - add_config_file_name(optarg); - } - break; - - } - } - - if (help_flag) - { - printf("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n"); - printf("--help | -h\tdisplay this help\n"); - printf("--file | -f\tuse configuration file \n"); - printf("--search | -s\tdir to search for config files and scripts.\n"); - printf("--debug | -d\tset debug level <0-3>\n"); - printf("--log_output | -l\tredirect log output to file \n"); - printf("--command | -c\trun \n"); - exit(-1); - } - - /* 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); - - return ERROR_OK; -} +/*************************************************************************** + * 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 * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + ***************************************************************************/ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "configuration.h" +// @todo the inclusion of server.h here is a layering violation +#include + +#include + +static int help_flag, version_flag; + +static const struct option long_options[] = +{ + {"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 *context, const char* line) +{ + LOG_USER_N("%s", line); + + return ERROR_OK; +} + +static void 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); + } + /* + * 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 + /* + * 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); + } + } + + add_script_search_dir(PKGDATADIR "/site"); + add_script_search_dir(PKGDATADIR "/scripts"); +#endif +} + +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. */ + 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: + break; + 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_command(command_buffer); + 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); + break; + case 'l': /* --log_output | -l */ + if (optarg) + { + 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 + /* pipes unsupported on hosted platforms */ + LOG_WARNING("pipes not supported on this platform"); +#else + server_use_pipes = 1; +#endif + break; + } + } + + if (help_flag) + { + 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); + } + + if (version_flag) + { + /* Nothing to do, version gets printed automatically. */ + // It is not an error to request the VERSION number. + exit(0); + } + + /* paths specified on the command line take precedence over these + * built-in paths + */ + add_default_dirs(); + + return ERROR_OK; +}