jtag: fix jtag configure command containing events

Commit ea2e26f7d521 ("jtag: rewrite jim_jtag_configure() as
COMMAND_HANDLER") breaks the option -event if it is the last of
the command line.
This can be tested, even without any device connected, through:
	#> openocd -f board/ti_cc26x0_launchpad.cfg
	wrong # args: should be "-event <event-name> <event-body>"

Fix the check on available arguments after -event.

Change-Id: Iec1522238f906d61a888a09a7685acd9ac6442a7
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reported-by: Lorenz Brun <lorenz@brun.one>
Fixes: ea2e26f7d521 ("jtag: rewrite jim_jtag_configure() as COMMAND_HANDLER")
Reviewed-on: https://review.openocd.org/c/openocd/+/8125
Tested-by: jenkins
Reviewed-by: Lorenz Brun <lorenz@brun.one>

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 163edfa19e34f94932915e55d1cfa94fa60f184e..79955290187e22c56e8d63cb99faaebf41a701a1 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -315,7 +315,7 @@ __COMMAND_HANDLER(handle_jtag_configure)
                const struct nvp *n = nvp_name2value(nvp_config_opts, CMD_ARGV[i]);
                switch (n->value) {
                case JCFG_EVENT:
-                       if (i + (is_configure ? 3 : 2) >= CMD_ARGC) {
+                       if (i + (is_configure ? 2 : 1) >= CMD_ARGC) {
                                command_print(CMD, "wrong # args: should be \"-event <event-name>%s\"",
                                                is_configure ? " <event-body>" : "");
                                return ERROR_COMMAND_ARGUMENT_INVALID;