From aca998c354db4006fd821a47b09e55775c61371d Mon Sep 17 00:00:00 2001 From: Leo C Date: Fri, 23 Oct 2015 15:14:56 +0200 Subject: [PATCH] cli.c: bugfix in cli_parse_line(): correct nargs --- avr/cli.c | 11 +++++++---- z180/z180reg.inc | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/avr/cli.c b/avr/cli.c index 43b5be0..e66554a 100644 --- a/avr/cli.c +++ b/avr/cli.c @@ -44,9 +44,7 @@ static int cli_parse_line(char *line, char *argv[]) debug_parser("%s: \"%s\"\n", __func__, line); - for (outp = inp = line, quote = '\0' ; - nargs < CONFIG_SYS_MAXARGS && (c = *inp) != '\0'; - inp++) { + for (outp = inp = line, quote = '\0'; (c = *inp) != '\0'; inp++) { switch (state) { case 0: /* before arg string, waiting for arg start */ @@ -91,6 +89,11 @@ static int cli_parse_line(char *line, char *argv[]) break; } + + if (nargs > CONFIG_SYS_MAXARGS) { + --nargs; + break; + } *outp++ = c; } @@ -397,7 +400,7 @@ command_ret_t do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) arg = getenv(argv[i]); if (arg == NULL) { - printf_P(PSTR("## Error: \"%s\" not defined\n"), argv[i]); + printf_P(PSTR("## Error: \"%s\" is not set\n"), argv[i]); return CMD_RET_FAILURE; } diff --git a/z180/z180reg.inc b/z180/z180reg.inc index 2666867..a1a90c2 100644 --- a/z180/z180reg.inc +++ b/z180/z180reg.inc @@ -47,7 +47,7 @@ stat1 equ IOBASE+05h ;ASCI Status Channel 1 b2m FE,4 ;Framing Error b2m RIE,3 ;Receive Interrupt Enable b2m DCD0,2 ;Data Carrier Detect (Ch 0) - b2m CTS1E,2 ;Clear To Send (Ch 1) + b2m CTS1E,2 ;Clear To Send Enable (Ch 1) b2m TDRE,1 ;Transmit Data Register Empty b2m TIE,0 ;Transmit Interrupt Enable -- 2.39.2