projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
treewide: Migrate CONFIG_TSEC_ENET to Kconfig
[platform/kernel/u-boot.git]
/
common
/
cli_simple.c
diff --git
a/common/cli_simple.c
b/common/cli_simple.c
index
d8b40c9
..
cb642d2
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 <common.h>
#include <bootretry.h>
#include <cli.h>
+#include <console.h>
#include <linux/ctype.h>
#define DEBUG_PARSER 0 /* set to 1 to debug */
#include <linux/ctype.h>
#define DEBUG_PARSER 0 /* set to 1 to debug */
@@
-130,7
+131,7
@@
void cli_simple_process_macros(const char *input, char *output)
envname[i] = 0;
/* Get its value */
envname[i] = 0;
/* Get its value */
- envval =
getenv
(envname);
+ envval =
env_get
(envname);
/* Copy into the line if it exists */
if (envval != NULL)
/* Copy into the line if it exists */
if (envval != NULL)
@@
-167,7
+168,7
@@
void cli_simple_process_macros(const char *input, char *output)
* WARNING:
*
* We must create a temporary copy of the command since the command we get
* WARNING:
*
* We must create a temporary copy of the command since the command we get
- * may be the result from
getenv
(), which returns a pointer directly to
+ * may be the result from
env_get
(), which returns a pointer directly to
* the environment data, which may change magicly when the command we run
* creates or modifies environment variables (like "bootp" does).
*/
* the environment data, which may change magicly when the command we run
* creates or modifies environment variables (like "bootp" does).
*/
@@
-275,7
+276,8
@@
void cli_simple_loop(void)
flag = 0; /* assume no special flags for now */
if (len > 0)
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
else if (len == 0)
flag |= CMD_FLAG_REPEAT;
#ifdef CONFIG_BOOT_RETRY_TIME