If one defines HUSH_2021_PARSER, it is then possible to use 2021 parser with:
=> parser get
old
=> parser set 2021
2021> parser get
2021
Signed-off-by: Francis Laniel <francis.lan...@amarulasolutions.com>
---
cmd/parser.c | 14 ++++++++-
common/cli.c | 38 ++++++++++++++++++++----
include/asm-generic/global_data.h | 4 +++
include/cli_hush.h | 49 ++++++++++++++++++++++++++++++-
4 files changed, 97 insertions(+), 8 deletions(-)
diff --git a/cmd/parser.c b/cmd/parser.c
index 4283bc7566..292429bf26 100644
--- a/cmd/parser.c
+++ b/cmd/parser.c
@@ -12,6 +12,8 @@ static const char *gd_flags_to_parser(void)
{
if (gd->flags & GD_FLG_HUSH_OLD_PARSER)
return "old";
+ if (gd->flags & GD_FLG_HUSH_2021_PARSER)
+ return "2021";
return NULL;
}
@@ -34,12 +36,15 @@ static int parser_string_to_gd_flags(const char *parser)
{
if (!strcmp(parser, "old"))
return GD_FLG_HUSH_OLD_PARSER;
+ if (!strcmp(parser, "2021"))
+ return GD_FLG_HUSH_2021_PARSER;
return -1;
}
static void reset_parser_gd_flags(void)
{
gd->flags &= ~GD_FLG_HUSH_OLD_PARSER;
+ gd->flags &= ~GD_FLG_HUSH_2021_PARSER;
}
static int do_parser_set(struct cmd_tbl *cmdtp, int flag, int argc,
@@ -64,6 +69,13 @@ static int do_parser_set(struct cmd_tbl *cmdtp, int flag,
int argc,
printf("Want to set current parser to old, but its code was not
compiled!\n");
return CMD_RET_FAILURE;
}
+
+ if (parser_flag == GD_FLG_HUSH_2021_PARSER
+ && !CONFIG_IS_ENABLED(HUSH_2021_PARSER)) {
+ printf("Want to set current parser to 2021, but its code was
not compiled!\n");
+ return CMD_RET_FAILURE;
+ }
+
reset_parser_gd_flags();
gd->flags |= parser_flag;
@@ -101,7 +113,7 @@ static int do_parser(struct cmd_tbl *cmdtp, int flag, int
argc,
#if CONFIG_IS_ENABLED(SYS_LONGHELP)
static char parser_help_text[] =
"get - print current parser\n"
- "set - set the current parser, possible value is: old"
+ "set - set the current parser, possible values are: old, 2021"
;
#endif
diff --git a/common/cli.c b/common/cli.c
index 82c69e5573..bff4a68640 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -40,12 +40,15 @@ int run_command(const char *cmd, int flag)
return 1;
return 0;
-#else
+#elif CONFIG_IS_ENABLED(HUSH_OLD_PARSER)
int hush_flags = FLAG_PARSE_SEMICOLON | FLAG_EXIT_FROM_LOOP;
if (flag & CMD_FLAG_ENV)
hush_flags |= FLAG_CONT_ON_NEWLINE;
return parse_string_outer(cmd, hush_flags);
+#else /* HUSH_2021_PARSER */
+ /* Not yet implemented. */
+ return 1;
#endif
}
@@ -105,7 +108,12 @@ int run_command_list(const char *cmd, int len, int flag)
buff[len] = '\0';
}
#ifdef CONFIG_HUSH_PARSER
+#if CONFIG_IS_ENABLED(HUSH_OLD_PARSER)
rcode = parse_string_outer(buff, FLAG_PARSE_SEMICOLON);
+#else /* HUSH_2021_PARSER */
+ /* Not yet implemented. */
+ rcode = 1;
+#endif
#else
/*
* This function will overwrite any \n it sees with a \0, which
@@ -225,8 +233,13 @@ err:
void cli_loop(void)
{
bootstage_mark(BOOTSTAGE_ID_ENTER_CLI_LOOP);
-#ifdef CONFIG_HUSH_PARSER
- parse_file_outer();
+#if CONFIG_IS_ENABLED(HUSH_PARSER)
+ if (gd->flags & GD_FLG_HUSH_2021_PARSER)
+ parse_and_run_file();
+ else if (gd->flags & GD_FLG_HUSH_OLD_PARSER)
+ parse_file_outer();
+
+ printf("Problem\n");
/* This point is never reached */
for (;;);
#elif defined(CONFIG_CMDLINE)
@@ -239,10 +252,23 @@ void cli_loop(void)
void cli_init(void)
{
#ifdef CONFIG_HUSH_PARSER
+ /* This if block is used to initialize hush parser gd flag. */
if (!(gd->flags & GD_FLG_HUSH_OLD_PARSER)
- && CONFIG_IS_ENABLED(HUSH_OLD_PARSER))
- gd->flags |= GD_FLG_HUSH_OLD_PARSER;
- u_boot_hush_start();
+ && !(gd->flags & GD_FLG_HUSH_2021_PARSER)) {
+ if (CONFIG_IS_ENABLED(HUSH_OLD_PARSER))
+ gd->flags |= GD_FLG_HUSH_OLD_PARSER;
+ else if (CONFIG_IS_ENABLED(HUSH_2021_PARSER))
+ gd->flags |= GD_FLG_HUSH_2021_PARSER;
+ }
+
+ if (gd->flags & GD_FLG_HUSH_OLD_PARSER) {
+ u_boot_hush_start();
+ } else if (gd->flags & GD_FLG_HUSH_2021_PARSER) {
+ u_boot_hush_start_2021();
+ } else {
+ printf("No valid hush parser to use, cli will not
initialized!\n");
+ return;
+ }
#endif
#if defined(CONFIG_HUSH_INIT_VAR)
diff --git a/include/asm-generic/global_data.h
b/include/asm-generic/global_data.h
index 97c0de6398..fa2daf839d 100644
--- a/include/asm-generic/global_data.h
+++ b/include/asm-generic/global_data.h
@@ -639,6 +639,10 @@ enum gd_flags {
* @GD_FLG_HUSH_OLD_PARSER: Use hush old parser.
*/
GD_FLG_HUSH_OLD_PARSER = 0x100000,
+ /**
+ * @GD_FLG_HUSH_2021_PARSER: Use hush 2021 parser.
+ */
+ GD_FLG_HUSH_2021_PARSER = 0x200000
};
#endif /* __ASSEMBLY__ */
diff --git a/include/cli_hush.h b/include/cli_hush.h
index 2bd35670c7..6261aa1806 100644
--- a/include/cli_hush.h
+++ b/include/cli_hush.h
@@ -12,11 +12,58 @@
#define FLAG_REPARSING (1 << 2) /* >=2nd pass */
#define FLAG_CONT_ON_NEWLINE (1 << 3) /* continue when we see \n */
+#if CONFIG_IS_ENABLED(HUSH_OLD_PARSER)
extern int u_boot_hush_start(void);
extern int parse_string_outer(const char *, int);
extern int parse_file_outer(void);
-
int set_local_var(const char *s, int flg_export);
+#else
+static inline int u_boot_hush_start(void)
+{
+ return 0;
+}
+
+static inline int parse_string_outer(const char* str, int flag)
+{
+ return 1;
+}
+
+static inline int parse_file_outer(void)
+{
+ return 0;
+}
+
+static inline int set_local_var(const char *s, int flg_export)
+{
+ return 0;
+}
+#endif
+#if CONFIG_IS_ENABLED(HUSH_2021_PARSER)
+extern int u_boot_hush_start_2021(void);
+extern int parse_string_outer_2021(const char *, int);
+extern void parse_and_run_file(void);
+int set_local_var_2021(char *s, int flg_export);
+#else
+static inline int u_boot_hush_start_2021(void)
+{
+ return 0;
+}
+
+static inline int parse_string_outer_2021(const char* str, int flag)
+{
+ return 1;
+}
+
+static inline void parse_and_run_file(void)
+{
+}
+
+static inline int set_local_var_2021(char *s, int flg_export)
+{
+ return 0;
+}
+#endif
+
void unset_local_var(const char *name);
char *get_local_var(const char *s);
--
2.25.1
