zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

command: Fix confusing syntax error message 

If the user executes a command with an invalid subcommand, the error
message is extremely unhelpful:

> flash write test.elf
flash write test.elf: command requires more arguments

This is because any command line that starts with a valid command group is
classified as a group, triggering ocd_bouncer to print the confusing
message.

Fix by requiring that to be a command group, the command line must not
contain any unknown tokens after the last valid (sub-)command group. That
is OK because command groups don't have handlers defined and thus can't
take any parameters.

Also fix the error message for "unknown" type to be similar to the error
message that is printed (by Jim) for non-existent primary commands.

Change-Id: I26950349f0909fd3961c4f9ab9b198c221cea9fc
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/2285
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
__archive__
Andreas Fritiofson 2014-09-10 00:13:09 +02:00 committed by Spencer Oliver
parent 1c021ed0af
commit c0b8e605f7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/helper/command.c
View File

@ -1070,8 +1070,10 @@ static int jim_command_type(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
Jim_SetResultString(interp, "native", -1); Jim_SetResultString(interp, "native", -1);
else if (c->handler) else if (c->handler)
Jim_SetResultString(interp, "simple", -1); Jim_SetResultString(interp, "simple", -1);
else else if (remaining == 0)
Jim_SetResultString(interp, "group", -1); Jim_SetResultString(interp, "group", -1);
else
Jim_SetResultString(interp, "unknown", -1);
return JIM_OK; return JIM_OK;
} }

2
src/helper/startup.tcl
View File

@ -30,7 +30,7 @@ proc ocd_bouncer {name args} {
set errmsg [format "%s: command requires more arguments" \ set errmsg [format "%s: command requires more arguments" \
[concat $name " " $args]] [concat $name " " $args]]
} else { } else {
set errmsg [format "Unknown command type: %s" $type] set errmsg [format "invalid subcommand \"%s\"" $args]
}}} }}}
return -code error $errmsg return -code error $errmsg
} }