projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arndale: fix unknown status
[oweals/u-boot.git]
/
common
/
cli_simple.c
diff --git
a/common/cli_simple.c
b/common/cli_simple.c
index 9c3d073d583b818b9afe8e17e10380d6b76e6349..311880ad56ab33005f344128f051f3d7687fa07e 100644
(file)
--- a/
common/cli_simple.c
+++ b/
common/cli_simple.c
@@
-1,3
+1,4
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2000
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
@@
-5,8
+6,6
@@
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
* Add to readline cmdline-editing by
* (C) Copyright 2005
* JinHua Luo, GuangDong Linux Center, <luo.jinhua@gd-linux.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-131,7
+130,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)
@@
-168,7
+167,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).
*/
@@
-276,7
+275,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