projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
armv7r: dts: am654-base-board: Rename 1600MHz to 1600MTs in dtsi filename
[oweals/u-boot.git]
/
common
/
cli_simple.c
diff --git
a/common/cli_simple.c
b/common/cli_simple.c
index 0610615ea5ab05ea82efa7e172dd5fb9a23c5e0b..6c881c133c6139b27c56b2f6561903b5f0495567 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,12
+6,13
@@
* 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>
+#include <bootretry.h>
#include <cli.h>
#include <cli.h>
+#include <console.h>
+#include <env.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 */
@@
-19,7
+21,7
@@
debug_cond(DEBUG_PARSER, fmt, ##args)
debug_cond(DEBUG_PARSER, fmt, ##args)
-int parse_line(char *line, char *argv[])
+int
cli_simple_
parse_line(char *line, char *argv[])
{
int nargs = 0;
{
int nargs = 0;
@@
-56,7
+58,7
@@
int parse_line(char *line, char *argv[])
return nargs;
}
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;
{
char c, prev;
const char *varname_start = NULL;
@@
-67,7
+69,7
@@
static void process_macros(const char *input, char *output)
/* 1 = waiting for '(' or '{' */
/* 2 = waiting for ')' or '}' */
/* 3 = waiting for ''' */
/* 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);
debug_parser("[PROCESS_MACROS] INPUT len %zd: \"%s\"\n", strlen(input),
input);
@@
-129,7
+131,7
@@
static void 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)
@@
-166,7
+168,7
@@
static void 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).
*/
@@
-235,10
+237,10
@@
int cli_simple_run_command(const char *cmd, int flag)
debug_parser("token: \"%s\"\n", token);
/* find macros in this token and replace them */
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 */
/* Extract arguments */
- argc = parse_line(finaltoken, argv);
+ argc =
cli_simple_
parse_line(finaltoken, argv);
if (argc == 0) {
rc = -1; /* no command at all */
continue;
if (argc == 0) {
rc = -1; /* no command at all */
continue;
@@
-255,28
+257,27
@@
int cli_simple_run_command(const char *cmd, int flag)
return rc ? rc : repeatable;
}
return rc ? rc : repeatable;
}
-void cli_loop(void)
+void cli_
simple_
loop(void)
{
{
- static char lastcommand[CONFIG_SYS_CBSIZE] = { 0, };
+ static char lastcommand[CONFIG_SYS_CBSIZE
+ 1
] = { 0, };
int len;
int flag;
int rc = 1;
for (;;) {
int len;
int flag;
int rc = 1;
for (;;) {
-#ifdef CONFIG_BOOT_RETRY_TIME
if (rc >= 0) {
/* Saw enough of a valid command to
* restart the timeout.
*/
if (rc >= 0) {
/* Saw enough of a valid command to
* restart the timeout.
*/
- reset_cmd_timeout();
+
bootretry_
reset_cmd_timeout();
}
}
-#endif
- len = readline(CONFIG_SYS_PROMPT);
+ len = cli_readline(CONFIG_SYS_PROMPT);
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
@@
-296,7
+297,7
@@
void cli_loop(void)
if (len == -1)
puts("<INTERRUPT>\n");
else
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 */
if (rc <= 0) {
/* invalid command or not repeatable, forget it */
@@
-332,7
+333,7
@@
int cli_simple_run_command_list(char *cmd, int flag)
++next;
}
if (rcode == 0 && *line)
++next;
}
if (rcode == 0 && *line)
- rcode = (cli_simple_run_command(line, 0)
>=
0);
+ rcode = (cli_simple_run_command(line, 0)
<
0);
return rcode;
}
return rcode;
}