summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-29 14:34:17 +0000
committeroharboe <oharboe@b42882b7-edfa-0310-969c-e2dbd0fdcd60>2008-02-29 14:34:17 +0000
commitd08da2ec045f9da6536f6f7b18fc1f0d53904c40 (patch)
treec5ad948f2bd164593e544e8d73aa7e716ceeae9c /src
parent54196f7673f1324abfb3c7510f7515c32db95032 (diff)
downloadopenocd+libswd-d08da2ec045f9da6536f6f7b18fc1f0d53904c40.tar.gz
openocd+libswd-d08da2ec045f9da6536f6f7b18fc1f0d53904c40.tar.bz2
openocd+libswd-d08da2ec045f9da6536f6f7b18fc1f0d53904c40.tar.xz
openocd+libswd-d08da2ec045f9da6536f6f7b18fc1f0d53904c40.zip
Uwe Hermann: Add a --version switch for openocd.
git-svn-id: svn://svn.berlios.de/openocd/trunk@399 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src')
-rw-r--r--src/helper/options.c31
1 files changed, 20 insertions, 11 deletions
diff --git a/src/helper/options.c b/src/helper/options.c
index 35ab0f5d..b037a5ed 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -31,18 +31,17 @@
#include <getopt.h>
#include <string.h>
-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'},
{0, 0, 0, 0}
};
@@ -63,7 +62,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:", long_options, &option_index);
/* Detect the end of the options. */
if (c == -1)
@@ -76,6 +75,9 @@ 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);
@@ -109,8 +111,9 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
if (help_flag)
{
- OUTPUT("Open On-Chip Debugger\n(c) 2005 by Dominic Rath\n\n");
+ OUTPUT("Open On-Chip Debugger\n(c) 2005-2008 by Dominic Rath\n\n");
OUTPUT("--help | -h\tdisplay this help\n");
+ OUTPUT("--version | -v\tdisplay OpenOCD version\n");
OUTPUT("--file | -f\tuse configuration file <name>\n");
OUTPUT("--search | -s\tdir to search for config files and scripts.\n");
OUTPUT("--debug | -d\tset debug level <0-3>\n");
@@ -119,6 +122,12 @@ int parse_cmdline_args(struct command_context_s *cmd_ctx, int argc, char *argv[]
exit(-1);
}
+ if (version_flag)
+ {
+ /* Nothing to do, version gets printed automatically. */
+ exit(-1);
+ }
+
#ifdef _WIN32
/* Add the parent of the directory where openocd.exe resides to the
* config script search path.