[prev in list] [next in list] [prev in thread] [next in thread] 

List:       busybox
Subject:    Re: [PATCH v2] ash: fix build failure when command built-in is disabled
From:       Denys Vlasenko <vda.linux () googlemail ! com>
Date:       2020-04-30 14:44:09
Message-ID: CAK1hOcMsg+h6k70gu4+FwXmTZ4jScLLLqwL=0Ed4BRg+aOeq+Q () mail ! gmail ! com
[Download RAW message or body]

Applied, thanks!

On Thu, Feb 27, 2020 at 10:50 AM Ron Yorston <rmy@pobox.com> wrote:
>
> Since commit 7eb8eecbb (ash: eval: Add assignment built-in support
> again) building BusyBox with the 'command' built-in disabled fails.
>
> parse_command_args() only needs to be called when the 'command'
> built-in is run.  Which it won't be if it's disabled.
>
> v2: Avoiding infinite loops is good, too.  Thanks, Harald van Dijk.
>
> Reported-by: Deweloper <deweloper@wp.pl>
> Signed-off-by: Ron Yorston <rmy@pobox.com>
> ---
>  shell/ash.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/shell/ash.c b/shell/ash.c
> index d0d99f60e..a11b1d67d 100644
> --- a/shell/ash.c
> +++ b/shell/ash.c
> @@ -8675,7 +8675,6 @@ typecmd(int argc UNUSED_PARAM, char **argv)
>         return err;
>  }
>
> -#if ENABLE_ASH_CMDCMD
>  static struct strlist *
>  fill_arglist(struct arglist *arglist, union node **argpp)
>  {
> @@ -8692,6 +8691,7 @@ fill_arglist(struct arglist *arglist, union node **argpp)
>         return *lastp;
>  }
>
> +#if ENABLE_ASH_CMDCMD
>  /* Is it "command [-p] PROG ARGS" bltin, no other opts? Return ptr to "PROG" if yes */
>  static int
>  parse_command_args(struct arglist *arglist, union node **argpp, const char **path)
> @@ -10190,11 +10190,13 @@ evalcommand(union node *cmd, int flags)
>                                 vlocal = !spclbltin;
>                         }
>                         cmd_is_exec = cmdentry.u.cmd == EXECCMD;
> +#if ENABLE_ASH_CMDCMD
>                         if (cmdentry.u.cmd != COMMANDCMD)
>                                 break;
>
>                         cmd_flag = parse_command_args(&arglist, &argp, &path);
>                         if (!cmd_flag)
> +#endif
>                                 break;
>                 }
>
> --
> 2.24.1
>
> _______________________________________________
> busybox mailing list
> busybox@busybox.net
> http://lists.busybox.net/mailman/listinfo/busybox
_______________________________________________
busybox mailing list
busybox@busybox.net
http://lists.busybox.net/mailman/listinfo/busybox
[prev in list] [next in list] [prev in thread] [next in thread]