[U-Boot] [PATCH 2/2] hush: Add rudimentary support for PS1 and PS2

[Heiko Schocher]

Hello Marek,

Am 27.01.2016 um 04:47 schrieb Marek Vasut:
> Add trivial support for changing the U-Boot command prompt string
> by setting PS1 and PS2 environment variables. Only static variables
> are supported.
>
> Signed-off-by: Marek Vasut <marex at denx.de>
> ---
>   README            |  8 ++++++++
>   common/cli_hush.c | 10 ++++++++++
>   2 files changed, 18 insertions(+)

Nice!

Reviewed-by: Heiko Schocher <hs at denx.de>

bye,
Heiko
>
> diff --git a/README b/README
> index ece4793..8fb25c6 100644
> --- a/README
> +++ b/README
> @@ -2894,6 +2894,14 @@ CBFS (Coreboot Filesystem) support
>   		Enable editing and History functions for interactive
>   		command line input operations
>
> +- Command Line PS1/PS2 support:
> +		CONFIG_CMDLINE_PS_SUPPORT
> +
> +		Enable support for changing the command prompt string
> +		at run-time. Only static string is supported so far.
> +		The string is obtained from environment variables PS1
> +		and PS2.
> +
>   - Default Environment:
>   		CONFIG_EXTRA_ENV_SETTINGS
>
> diff --git a/common/cli_hush.c b/common/cli_hush.c
> index cbaf22e..00861e2 100644
> --- a/common/cli_hush.c
> +++ b/common/cli_hush.c
> @@ -978,12 +978,22 @@ static inline void setup_prompt_string(int promptmode, char **prompt_str)
>   static int uboot_cli_readline(struct in_str *i)
>   {
>   	char *prompt;
> +	char __maybe_unused *ps_prompt = NULL;
>
>   	if (i->promptmode == 1)
>   		prompt = CONFIG_SYS_PROMPT;
>   	else
>   		prompt = CONFIG_SYS_PROMPT_HUSH_PS2;
>
> +#ifdef CONFIG_CMDLINE_PS_SUPPORT
> +	if (i->promptmode == 1)
> +		ps_prompt = getenv("PS1");
> +	else
> +		ps_prompt = getenv("PS2");
> +	if (ps_prompt)
> +		prompt = ps_prompt;
> +#endif
> +
>   	return cli_readline(prompt);
>   }
>   #endif
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany