This is an automated email from Gerrit. Andreas Fritiofson ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/2285
-- gerrit commit 778e26bf3b241f929266c700f9e12760e94811e4 Author: Andreas Fritiofson <[email protected]> Date: Wed Sep 10 00:13:09 2014 +0200 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 <[email protected]> diff --git a/src/helper/command.c b/src/helper/command.c index 137ac7e..c29f113 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -1070,8 +1070,10 @@ static int jim_command_type(Jim_Interp *interp, int argc, Jim_Obj *const *argv) Jim_SetResultString(interp, "native", -1); else if (c->handler) Jim_SetResultString(interp, "simple", -1); - else + else if (remaining == 0) Jim_SetResultString(interp, "group", -1); + else + Jim_SetResultString(interp, "unknown", -1); return JIM_OK; } diff --git a/src/helper/startup.tcl b/src/helper/startup.tcl index a7c0d58..926d26b 100644 --- a/src/helper/startup.tcl +++ b/src/helper/startup.tcl @@ -30,7 +30,7 @@ proc ocd_bouncer {name args} { set errmsg [format "%s: command requires more arguments" \ [concat $name " " $args]] } else { - set errmsg [format "Unknown command type: %s" $type] + set errmsg [format "invalid subcommand \"%s\"" $args] }}} return -code error $errmsg } -- ------------------------------------------------------------------------------ Want excitement? Manually upgrade your production database. When you want reliability, choose Perforce. Perforce version control. Predictably reliable. http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
