cli.c: bugfix in cli_parse_line(): correct nargs

[z180-stamp.git] / avr / cli.c

diff --git a/avr/cli.c b/avr/cli.c
index 43b5be05a024037388b84cfc80e7f77f48f92722..e66554ac0ed58240966d70d8ba9c1c5e09660733 100644 (file)
--- 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;
                }