From 350e686f3b04f41f623316706094f0e18a10c1cf Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Wed, 26 Oct 2016 16:26:45 +0200 Subject: 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 character to be present in order for a here-document delimiter to be detected. Allowing EOF in the absence of a 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 --- shell/ash_test/ash-heredoc/heredoc6.right | 2 ++ shell/ash_test/ash-heredoc/heredoc6.tests | 4 ++++ shell/ash_test/ash-heredoc/heredoc7.right | 1 + shell/ash_test/ash-heredoc/heredoc7.tests | 3 +++ 4 files changed, 10 insertions(+) create mode 100644 shell/ash_test/ash-heredoc/heredoc6.right create mode 100755 shell/ash_test/ash-heredoc/heredoc6.tests create mode 100644 shell/ash_test/ash-heredoc/heredoc7.right create mode 100755 shell/ash_test/ash-heredoc/heredoc7.tests (limited to 'shell/ash_test/ash-heredoc') diff --git a/shell/ash_test/ash-heredoc/heredoc6.right b/shell/ash_test/ash-heredoc/heredoc6.right new file mode 100644 index 000000000..5d0f077cd --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc6.right @@ -0,0 +1,2 @@ +test +OK:0 diff --git a/shell/ash_test/ash-heredoc/heredoc6.tests b/shell/ash_test/ash-heredoc/heredoc6.tests new file mode 100755 index 000000000..346f5949a --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc6.tests @@ -0,0 +1,4 @@ +eval 'cat <<- NOT +test +NOT' +echo OK:$? diff --git a/shell/ash_test/ash-heredoc/heredoc7.right b/shell/ash_test/ash-heredoc/heredoc7.right new file mode 100644 index 000000000..5d9c6c6c0 --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc7.right @@ -0,0 +1 @@ +_ASBOX diff --git a/shell/ash_test/ash-heredoc/heredoc7.tests b/shell/ash_test/ash-heredoc/heredoc7.tests new file mode 100755 index 000000000..abd5941d9 --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc7.tests @@ -0,0 +1,3 @@ +cat << _ACEOF +_ASBOX +_ACEOF -- cgit v1.2.3