summaryrefslogtreecommitdiff
path: root/shell/ash_test
diff options
context:
space:
mode:
authorDenys Vlasenko2018-04-11 12:39:18 +0200
committerDenys Vlasenko2018-04-11 12:39:18 +0200
commit680c3016a2dddc3edb4d79868a728e899638e2c4 (patch)
tree6897bbd14235c8d2f424ce60a1b8e428961a9c4b /shell/ash_test
parent0403bedccc17c8ea3059523e32ea615e5df4bc26 (diff)
downloadbusybox-680c3016a2dddc3edb4d79868a728e899638e2c4.zip
busybox-680c3016a2dddc3edb4d79868a728e899638e2c4.tar.gz
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>
Diffstat (limited to 'shell/ash_test')
-rw-r--r--shell/ash_test/ash-vars/param_expand_alt2.right4
-rwxr-xr-xshell/ash_test/ash-vars/param_expand_alt2.tests7
2 files changed, 11 insertions, 0 deletions
diff --git a/shell/ash_test/ash-vars/param_expand_alt2.right b/shell/ash_test/ash-vars/param_expand_alt2.right
new file mode 100644
index 0000000..fef5889
--- /dev/null
+++ b/shell/ash_test/ash-vars/param_expand_alt2.right
@@ -0,0 +1,4 @@
+Unquoted: H H
+Quoted: H
+H
+Ok:0
diff --git a/shell/ash_test/ash-vars/param_expand_alt2.tests b/shell/ash_test/ash-vars/param_expand_alt2.tests
new file mode 100755
index 0000000..d8abf4c
--- /dev/null
+++ b/shell/ash_test/ash-vars/param_expand_alt2.tests
@@ -0,0 +1,7 @@
+echo Unquoted: H${$+
+}H
+
+echo Quoted: "H${$+
+}H"
+
+echo Ok:$?