diff options
Diffstat (limited to 'src/helper/options.c')
| -rw-r--r-- | src/helper/options.c | 78 |
1 files changed, 35 insertions, 43 deletions
diff --git a/src/helper/options.c b/src/helper/options.c index f8db2cda..e31066d7 100644 --- a/src/helper/options.c +++ b/src/helper/options.c @@ -20,32 +20,32 @@ * 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 +/* @todo the inclusion of server.h here is a layering violation */ #include <server/server.h> #include <getopt.h> 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'}, +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) +int configuration_output_handler(struct command_context *context, const char *line) { LOG_USER_N("%s", line); @@ -64,8 +64,8 @@ static void add_default_dirs(void) * target\at91eb40a.cfg */ { - char strExePath [MAX_PATH]; - GetModuleFileName (NULL, strExePath, MAX_PATH); + 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. */ @@ -84,11 +84,11 @@ static void add_default_dirs(void) * share/openocd/scripts/target/at91eb40a.cfg */ { - char strExePath [MAX_PATH]; + char strExePath[MAX_PATH]; char *p; - GetModuleFileName (NULL, strExePath, MAX_PATH); + GetModuleFileName(NULL, strExePath, MAX_PATH); *strrchr(strExePath, '\\') = 0; - strcat(strExePath, "/../share/"PACKAGE"/scripts"); + strcat(strExePath, "/../share/"PACKAGE "/scripts"); for (p = strExePath; *p; p++) { if (*p == '\\') *p = '/'; @@ -104,14 +104,12 @@ static void add_default_dirs(void) const char *home = getenv("HOME"); - if (home) - { + if (home) { char *path; path = alloc_printf("%s/.openocd", home); - if (path) - { + if (path) { add_script_search_dir(path); free(path); } @@ -127,8 +125,7 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[]) int c; char command_buffer[128]; - while (1) - { + while (1) { /* getopt_long stores the option index here. */ int option_index = 0; @@ -138,56 +135,52 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[]) if (c == -1) break; - switch (c) - { + switch (c) { case 0: break; - case 'h': /* --help | -h */ + case 'h': /* --help | -h */ help_flag = 1; break; - case 'v': /* --version | -v */ + case 'v': /* --version | -v */ version_flag = 1; break; - case 'f': /* --file | -f */ + case 'f': /* --file | -f */ { snprintf(command_buffer, 128, "script {%s}", optarg); add_config_command(command_buffer); break; } - case 's': /* --search | -s */ + case 's': /* --search | -s */ add_script_search_dir(optarg); break; - case 'd': /* --debug | -d */ + 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) - { + 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 */ + case 'c': /* --command | -c */ if (optarg) - { - add_config_command(optarg); - } + add_config_command(optarg); break; case 'p': /* to replicate the old syntax this needs to be synchronous * otherwise the gdb stdin will overflow with the warning message */ command_run_line(cmd_ctx, "gdb_port pipe; log_output openocd.log"); - LOG_WARNING("deprecated option: -p/--pipe. Use '-c \"gdb_port pipe; log_output openocd.log\"' instead."); + LOG_WARNING("deprecated option: -p/--pipe. Use '-c \"gdb_port pipe; " + "log_output openocd.log\"' instead."); break; } } - if (help_flag) - { + if (help_flag) { LOG_OUTPUT("Open On-Chip Debugger\nLicensed under GNU GPL v2\n"); LOG_OUTPUT("--help | -h\tdisplay this help\n"); LOG_OUTPUT("--version | -v\tdisplay OpenOCD version\n"); @@ -199,10 +192,9 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[]) exit(-1); } - if (version_flag) - { + if (version_flag) { /* Nothing to do, version gets printed automatically. */ - // It is not an error to request the VERSION number. + /* It is not an error to request the VERSION number. */ exit(0); } |