Merge branch 'master' of git://git.denx.de/u-boot-tegra

[people/ms/u-boot.git] / common / cli_simple.c

diff --git a/common/cli_simple.c b/common/cli_simple.c
index 413c2eb89ec26fb5d68522ac33e0eddbf679dee2..bb96aaead60452b87cf44979b9dc586630855cf7 100644 (file)
--- a/common/cli_simple.c
+++ b/common/cli_simple.c
@@ -12,6 +12,7 @@
 #include <common.h>
 #include <bootretry.h>
 #include <cli.h>
+#include <console.h>
 #include <linux/ctype.h>
 
 #define DEBUG_PARSER   0       /* set to 1 to debug */
@@ -57,7 +58,7 @@ int cli_simple_parse_line(char *line, char *argv[])
        return nargs;
 }
 
-static void process_macros(const char *input, char *output)
+void cli_simple_process_macros(const char *input, char *output)
 {
        char c, prev;
        const char *varname_start = NULL;
@@ -68,7 +69,7 @@ static void process_macros(const char *input, char *output)
        /* 1 = waiting for '(' or '{' */
        /* 2 = waiting for ')' or '}' */
        /* 3 = waiting for '''  */
-       char *output_start = output;
+       char __maybe_unused *output_start = output;
 
        debug_parser("[PROCESS_MACROS] INPUT len %zd: \"%s\"\n", strlen(input),
                     input);
@@ -236,7 +237,7 @@ int cli_simple_run_command(const char *cmd, int flag)
                debug_parser("token: \"%s\"\n", token);
 
                /* find macros in this token and replace them */
-               process_macros(token, finaltoken);
+               cli_simple_process_macros(token, finaltoken);
 
                /* Extract arguments */
                argc = cli_simple_parse_line(finaltoken, argv);
@@ -258,7 +259,7 @@ int cli_simple_run_command(const char *cmd, int flag)
 
 void cli_simple_loop(void)
 {
-       static char lastcommand[CONFIG_SYS_CBSIZE] = { 0, };
+       static char lastcommand[CONFIG_SYS_CBSIZE + 1] = { 0, };
 
        int len;
        int flag;
@@ -275,7 +276,8 @@ void cli_simple_loop(void)
 
                flag = 0;       /* assume no special flags for now */
                if (len > 0)
-                       strcpy(lastcommand, console_buffer);
+                       strlcpy(lastcommand, console_buffer,
+                               CONFIG_SYS_CBSIZE + 1);
                else if (len == 0)
                        flag |= CMD_FLAG_REPEAT;
 #ifdef CONFIG_BOOT_RETRY_TIME
@@ -295,7 +297,7 @@ void cli_simple_loop(void)
                if (len == -1)
                        puts("<INTERRUPT>\n");
                else
-                       rc = run_command(lastcommand, flag);
+                       rc = run_command_repeatable(lastcommand, flag);
 
                if (rc <= 0) {
                        /* invalid command or not repeatable, forget it */
@@ -331,7 +333,7 @@ int cli_simple_run_command_list(char *cmd, int flag)
                ++next;
        }
        if (rcode == 0 && *line)
-               rcode = (cli_simple_run_command(line, 0) >= 0);
+               rcode = (cli_simple_run_command(line, 0) < 0);
 
        return rcode;
 }