[PATCH] hush: Fix assignments being misinterpreted as commands

[Tom Rini <trini@konsulko.com>]

On Sun, Feb 28, 2021 at 04:29:51PM -0500, Sean Anderson wrote:

> If there were no variable substitutions in a command, then initial
> assignments would be misinterpreted as commands, instead of being skipped
> over. This is demonstrated by the following example:
> 
> 	=> foo=bar echo baz
> 	Unknown command 'foo=bar' - try 'help'
> 
> Signed-off-by: Sean Anderson <seanga2@gmail.com>
> ---
> 
>  common/cli_hush.c    | 2 +-
>  test/cmd/test_echo.c | 2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/common/cli_hush.c b/common/cli_hush.c
> index b7f0f0ff41..1b9bef64b6 100644
> --- a/common/cli_hush.c
> +++ b/common/cli_hush.c
> @@ -1672,7 +1672,7 @@ static int run_pipe_real(struct pipe *pi)
>  			return -1;
>  		}
>  		/* Process the command */
> -		return cmd_process(flag, child->argc, child->argv,
> +		return cmd_process(flag, child->argc - i, child->argv + i,
>  				   &flag_repeat, NULL);
>  #endif
>  	}
> diff --git a/test/cmd/test_echo.c b/test/cmd/test_echo.c
> index 4183cf75bb..13e1fb7c82 100644
> --- a/test/cmd/test_echo.c
> +++ b/test/cmd/test_echo.c
> @@ -33,6 +33,8 @@ static struct test_data echo_data[] = {
>  	 */
>  	{"setenv jQx X; echo \"a)\" ${jQx} 'b)' '${jQx}' c) ${jQx}; setenv jQx",
>  	 "a) X b) ${jQx} c) X"},
> +	/* Test shell variable assignments without substitutions */
> +	{"foo=bar echo baz", "baz"},
>  	/* Test handling of shell variables. */
>  	{"setenv jQx; for jQx in 1 2 3; do echo -n \"${jQx}, \"; done; echo;",
>  	 "1, 2, 3, "},

OK, I'm really confused now.  With and without this patch, in sandbox I
see:
=> foo=bar echo $foo
bar
=> echo $foo
bar

Which doesn't match dash, busybox-sh nor bash 4.4.20, all of which do
something like:
$ foo=bar echo $foo

$ echo $foo

$

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210301/a57b77f6/attachment.sig>