aboutsummaryrefslogtreecommitdiff
path: root/src/helper
diff options
context:
space:
mode:
authorGirts <girtsf@users.noreply.github.com>2016-11-05 14:38:55 -0700
committerFreddie Chopin <freddie.chopin@gmail.com>2017-04-23 21:37:59 +0100
commitf63af76466234cc905df6ea8e0f3fb5284c2058d (patch)
tree98b0f3eb9cb78563a2ea0af56b5cf19d30d3de7b /src/helper
parent1894292032cfa64a745349344ee7b6271867444f (diff)
downloadriscv-openocd-f63af76466234cc905df6ea8e0f3fb5284c2058d.zip
riscv-openocd-f63af76466234cc905df6ea8e0f3fb5284c2058d.tar.gz
riscv-openocd-f63af76466234cc905df6ea8e0f3fb5284c2058d.tar.bz2
help/options.c: add error handling for -d arg
Fail if we fail to set debug level. Also, clarify in usage string that -d<n> doesn't accept spaces. Change-Id: I9ea9945dc068e3e7cfd18b16ffa2a29366d6e4d1 Signed-off-by: Girts Folkmanis <opensource@girts.me> Reviewed-on: http://openocd.zylin.com/3880 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
Diffstat (limited to 'src/helper')
-rw-r--r--src/helper/options.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/helper/options.c b/src/helper/options.c
index 409abee..0016659 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -267,8 +267,10 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
case 'd': /* --debug | -d */
{
char *command = alloc_printf("debug_level %s", optarg ? optarg : "3");
- command_run_line(cmd_ctx, command);
+ int retval = command_run_line(cmd_ctx, command);
free(command);
+ if (retval != ERROR_OK)
+ return retval;
break;
}
case 'l': /* --log_output | -l */
@@ -298,7 +300,8 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
LOG_OUTPUT("--version | -v\tdisplay OpenOCD version\n");
LOG_OUTPUT("--file | -f\tuse configuration file <name>\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("--debug | -d\tset debug level to 3\n");
+ LOG_OUTPUT(" | -d<n>\tset debug level to <level>\n");
LOG_OUTPUT("--log_output | -l\tredirect log output to file <name>\n");
LOG_OUTPUT("--command | -c\trun <command>\n");
exit(-1);