summaryrefslogtreecommitdiff
path: root/shell/hush_test/hush-heredoc
diff options
context:
space:
mode:
authorDenys Vlasenko2018-03-31 19:21:31 +0200
committerDenys Vlasenko2018-03-31 19:40:56 +0200
commit220be537a03f029e1e619003d6f7def10103a156 (patch)
tree73a8c8d1a19796c15db0dc7b238cf8bc644a4e46 /shell/hush_test/hush-heredoc
parentad4e961352f04ba88019c4c2bb36c652ce9c51fa (diff)
downloadbusybox-220be537a03f029e1e619003d6f7def10103a156.zip
busybox-220be537a03f029e1e619003d6f7def10103a156.tar.gz
ash: use pgetc_eatbnl() in more places
Part of upstream commit: Date: Thu Mar 8 08:37:11 2018 +0100 Author: Harald van Dijk <harald@gigawatt.nl> parser: use pgetc_eatbnl() in more places dash has a pgetc_eatbnl function in parser.c which skips any backslash-newline combinations. It's not used everywhere it could be. There is also some duplicated backslash-newline handling elsewhere in parser.c. Replace most of the calls to pgetc() with calls to pgetc_eatbnl() and remove the duplicated backslash-newline handling. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Not adding "readtoken1(pgetc_eatbnl(), DQSYNTAX..." changes, since readtoken1() handles the "starts with backslash + newline" case itself. Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test/hush-heredoc')
-rw-r--r--shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right8
-rwxr-xr-xshell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests25
2 files changed, 33 insertions, 0 deletions
diff --git a/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right
new file mode 100644
index 0000000..fdb7ebd
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.right
@@ -0,0 +1,8 @@
+heredoc0
+Ok0:0
+heredoc1
+Ok1:0
+heredoc2
+Ok2:0
+heredoc3
+Ok4:0
diff --git a/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests
new file mode 100755
index 0000000..584edd0
--- /dev/null
+++ b/shell/hush_test/hush-heredoc/heredoc_bkslash_newline1.tests
@@ -0,0 +1,25 @@
+cat <\
+<\
+EOF
+heredoc0
+EOF
+echo Ok0:$?
+
+cat <<\
+ EOF
+heredoc1
+EOF
+echo Ok1:$?
+
+cat <<\
+- EOF
+heredoc2
+ EOF
+echo Ok2:$?
+
+cat <\
+<\
+- EOF
+heredoc3
+ EOF
+echo Ok4:$?