We now have a single entry point to the CLI, whether simple or hush. Put this in its own file. Signed-off-by: Simon Glass <sjg@chromium.org>master
parent
66ded17dfc
commit
30354978ff
@ -0,0 +1,106 @@ |
||||
/*
|
||||
* (C) Copyright 2000 |
||||
* Wolfgang Denk, DENX Software Engineering, wd@denx.de. |
||||
* |
||||
* 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 <cli.h> |
||||
#include <cli_hush.h> |
||||
#include <malloc.h> |
||||
|
||||
/*
|
||||
* Run a command using the selected parser. |
||||
* |
||||
* @param cmd Command to run |
||||
* @param flag Execution flags (CMD_FLAG_...) |
||||
* @return 0 on success, or != 0 on error. |
||||
*/ |
||||
int run_command(const char *cmd, int flag) |
||||
{ |
||||
#ifndef CONFIG_SYS_HUSH_PARSER |
||||
/*
|
||||
* cli_run_command can return 0 or 1 for success, so clean up |
||||
* its result. |
||||
*/ |
||||
if (cli_simple_run_command(cmd, flag) == -1) |
||||
return 1; |
||||
|
||||
return 0; |
||||
#else |
||||
return parse_string_outer(cmd, |
||||
FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP); |
||||
#endif |
||||
} |
||||
|
||||
int run_command_list(const char *cmd, int len, int flag) |
||||
{ |
||||
int need_buff = 1; |
||||
char *buff = (char *)cmd; /* cast away const */ |
||||
int rcode = 0; |
||||
|
||||
if (len == -1) { |
||||
len = strlen(cmd); |
||||
#ifdef CONFIG_SYS_HUSH_PARSER |
||||
/* hush will never change our string */ |
||||
need_buff = 0; |
||||
#else |
||||
/* the built-in parser will change our string if it sees \n */ |
||||
need_buff = strchr(cmd, '\n') != NULL; |
||||
#endif |
||||
} |
||||
if (need_buff) { |
||||
buff = malloc(len + 1); |
||||
if (!buff) |
||||
return 1; |
||||
memcpy(buff, cmd, len); |
||||
buff[len] = '\0'; |
||||
} |
||||
#ifdef CONFIG_SYS_HUSH_PARSER |
||||
rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON); |
||||
#else |
||||
/*
|
||||
* This function will overwrite any \n it sees with a \0, which |
||||
* is why it can't work with a const char *. Here we are making |
||||
* using of internal knowledge of this function, to avoid always |
||||
* doing a malloc() which is actually required only in a case that |
||||
* is pretty rare. |
||||
*/ |
||||
rcode = cli_simple_run_command_list(buff, flag); |
||||
if (need_buff) |
||||
free(buff); |
||||
#endif |
||||
|
||||
return rcode; |
||||
} |
||||
|
||||
/****************************************************************************/ |
||||
|
||||
#if defined(CONFIG_CMD_RUN) |
||||
int do_run(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) |
||||
{ |
||||
int i; |
||||
|
||||
if (argc < 2) |
||||
return CMD_RET_USAGE; |
||||
|
||||
for (i = 1; i < argc; ++i) { |
||||
char *arg; |
||||
|
||||
arg = getenv(argv[i]); |
||||
if (arg == NULL) { |
||||
printf("## Error: \"%s\" not defined\n", argv[i]); |
||||
return 1; |
||||
} |
||||
|
||||
if (run_command(arg, flag) != 0) |
||||
return 1; |
||||
} |
||||
return 0; |
||||
} |
||||
#endif |
Loading…
Reference in new issue