ash: parser: Allow newlines within parameter substitution
authorDenys Vlasenko <vda.linux@googlemail.com>
Wed, 11 Apr 2018 10:39:18 +0000 (12:39 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Wed, 11 Apr 2018 10:39:18 +0000 (12:39 +0200)
commit680c3016a2dddc3edb4d79868a728e899638e2c4
tree6897bbd14235c8d2f424ce60a1b8e428961a9c4b
parent0403bedccc17c8ea3059523e32ea615e5df4bc26
ash: parser: Allow newlines within parameter substitution

Upstream commit:

Date: Thu, 22 Mar 2018 21:41:24 +0800
parser: Allow newlines within parameter substitution

    On Fri, Mar 16, 2018 at 11:27:22AM +0800, Herbert Xu wrote:
    > On Thu, Mar 15, 2018 at 10:49:15PM +0100, Harald van Dijk wrote:
    > >
    > > Okay, it can be trivially modified to something that does work in other
    > > shells (even if it were actually executed), but gets rejected at parse time
    > > by dash:
    > >
    > >   if false; then
    > >     : ${$+
    > >   }
    > >   fi
    >
    > That's just a bug in dash's parser with ${} in general, because
    > it bombs out without the if clause too:
    >
    >  : ${$+
    >  }

    This patch fixes the parsing of newlines with parameter substitution.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
shell/ash.c
shell/ash_test/ash-vars/param_expand_alt2.right [new file with mode: 0644]
shell/ash_test/ash-vars/param_expand_alt2.tests [new file with mode: 0755]
shell/hush_test/hush-vars/param_expand_alt2.right [new file with mode: 0644]
shell/hush_test/hush-vars/param_expand_alt2.tests [new file with mode: 0755]