diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-10-26 16:26:45 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-10-26 16:26:45 +0200 |
| commit | 350e686f3b04f41f623316706094f0e18a10c1cf (patch) | |
| tree | 721ff03c6f5538060cc91f5c03bb9047c354970c /shell/hush_test | |
| parent | f15aa57a7f5edcbf3098873b8798c0ea7f496ed7 (diff) | |
ash: [PARSER] Recognise here-doc delimiters terminated by EOF
Upstream commit 1:
Date: Wed, 26 Sep 2007 17:14:16 +0800
[PARSER] Recognise here-doc delimiters terminated by EOF
Previously dash required a <newline> character to be present in order for
a here-document delimiter to be detected. Allowing EOF in the absence of
a <newline> to play the same purpose allows some intuitive scripts to
succeed. POSIX seems to be silence on this so this should be OK.
Test case:
eval 'cat <<- NOT
test
NOT'
echo OK
Old result:
test
NOTOK
New result:
test
OK
Upstream commit 2:
Date: Sat, 20 Oct 2007 18:49:31 +0800
[PARSER] Fix here-doc corruption
The change
[PARSER] Recognise here-doc delimiters terminated by EOF
introduced a regerssion whereby lines starting with eofmark but are not equal
to eofmark would be corrupted. This patch fixes it.
Test case:
cat << _ACEOF
_ASBOX
_ACEOF
Old result:
SASBOX
New result:
_ASBOX
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/hush_test')
| -rw-r--r-- | shell/hush_test/hush-heredoc/heredoc6.right | 2 | ||||
| -rwxr-xr-x | shell/hush_test/hush-heredoc/heredoc6.tests | 4 | ||||
| -rw-r--r-- | shell/hush_test/hush-heredoc/heredoc7.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-heredoc/heredoc7.tests | 3 |
4 files changed, 10 insertions, 0 deletions
diff --git a/shell/hush_test/hush-heredoc/heredoc6.right b/shell/hush_test/hush-heredoc/heredoc6.right new file mode 100644 index 000000000..5d0f077cd --- /dev/null +++ b/shell/hush_test/hush-heredoc/heredoc6.right @@ -0,0 +1,2 @@ +test +OK:0 diff --git a/shell/hush_test/hush-heredoc/heredoc6.tests b/shell/hush_test/hush-heredoc/heredoc6.tests new file mode 100755 index 000000000..346f5949a --- /dev/null +++ b/shell/hush_test/hush-heredoc/heredoc6.tests @@ -0,0 +1,4 @@ +eval 'cat <<- NOT +test +NOT' +echo OK:$? diff --git a/shell/hush_test/hush-heredoc/heredoc7.right b/shell/hush_test/hush-heredoc/heredoc7.right new file mode 100644 index 000000000..5d9c6c6c0 --- /dev/null +++ b/shell/hush_test/hush-heredoc/heredoc7.right @@ -0,0 +1 @@ +_ASBOX diff --git a/shell/hush_test/hush-heredoc/heredoc7.tests b/shell/hush_test/hush-heredoc/heredoc7.tests new file mode 100755 index 000000000..abd5941d9 --- /dev/null +++ b/shell/hush_test/hush-heredoc/heredoc7.tests @@ -0,0 +1,3 @@ +cat << _ACEOF +_ASBOX +_ACEOF |