diff options
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | common/cli_hush_2021.c | 6 | ||||
| -rw-r--r-- | common/cli_hush_upstream.c | 5 |
3 files changed, 4 insertions, 9 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index aad859e..fda7767 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -26,7 +26,7 @@ config HUSH_PARSER choice HUSH_FLAVOR bool "Hush flavor to use" depends on HUSH_PARSER - default HUSH_OLD_PARSER + default HUSH_2021_PARSER config HUSH_OLD_PARSER bool "Use hush old parser" diff --git a/common/cli_hush_2021.c b/common/cli_hush_2021.c index 73c21ed..de78e9a 100644 --- a/common/cli_hush_2021.c +++ b/common/cli_hush_2021.c @@ -40,12 +40,6 @@ #define USE_FOR_NOMMU(...) __VA_ARGS__ #define USE_FOR_MMU(...) -/* TODO: Drop this before upstreaming */ -#ifdef CONFIG_SYS_PROMPT -#undef CONFIG_SYS_PROMPT -#define CONFIG_SYS_PROMPT "2021> " -#endif /* CONFIG_SYS_PROMPT */ - /* * Size-saving "small" ints (arch-dependent) */ diff --git a/common/cli_hush_upstream.c b/common/cli_hush_upstream.c index 498fd8d..6297ea8 100644 --- a/common/cli_hush_upstream.c +++ b/common/cli_hush_upstream.c @@ -1448,6 +1448,7 @@ static void xxfree(void *ptr) * HUSH_DEBUG >= 2 prints line number in this file where it was detected. */ #if HUSH_DEBUG < 2 +#include <linux/compiler.h> # define msg_and_die_if_script(lineno, ...) msg_and_die_if_script(__VA_ARGS__) # define syntax_error(lineno, msg) syntax_error(msg) # define syntax_error_at(lineno, msg) syntax_error_at(msg) @@ -1465,7 +1466,7 @@ static void die_if_script(void) } } -static void msg_and_die_if_script(unsigned lineno, const char *fmt, ...) +static void __maybe_unused msg_and_die_if_script(unsigned lineno, const char *fmt, ...) { va_list p; @@ -1539,7 +1540,7 @@ static void syntax_error_unexpected_ch(unsigned lineno UNUSED_PARAM, int ch) /* Replace each \x with x in place, return ptr past NUL. */ static char *unbackslash(char *src) { - char *dst = src = strchrnul(src, '\\'); + char *dst = src = (char *)strchrnul(src, '\\'); while (1) { if (*src == '\\') { src++; |