diff options
| -rw-r--r-- | shell/ash.c | 12 | ||||
| -rw-r--r-- | shell/ash_test/ash-heredoc/heredoc6.right | 2 | ||||
| -rwxr-xr-x | shell/ash_test/ash-heredoc/heredoc6.tests | 4 | ||||
| -rw-r--r-- | shell/ash_test/ash-heredoc/heredoc7.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-heredoc/heredoc7.tests | 3 | ||||
| -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 |
9 files changed, 29 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 2cebfe2..e0828d4 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -11592,11 +11592,17 @@ checkend: { if (c == *eofmark) { if (pfgets(line, sizeof(line)) != NULL) { char *p, *q; + int cc; p = line; - for (q = eofmark + 1; *q && *p == *q; p++, q++) - continue; - if (*p == '\n' && *q == '\0') { + for (q = eofmark + 1;; p++, q++) { + cc = *p; + if (cc == '\n') + cc = 0; + if (!*q || cc != *q) + break; + } + if (cc == *q) { c = PEOF; nlnoprompt(); } else { diff --git a/shell/ash_test/ash-heredoc/heredoc6.right b/shell/ash_test/ash-heredoc/heredoc6.right new file mode 100644 index 0000000..5d0f077 --- /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 0000000..346f594 --- /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 0000000..5d9c6c6 --- /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 0000000..abd5941 --- /dev/null +++ b/shell/ash_test/ash-heredoc/heredoc7.tests @@ -0,0 +1,3 @@ +cat << _ACEOF +_ASBOX +_ACEOF diff --git a/shell/hush_test/hush-heredoc/heredoc6.right b/shell/hush_test/hush-heredoc/heredoc6.right new file mode 100644 index 0000000..5d0f077 --- /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 0000000..346f594 --- /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 0000000..5d9c6c6 --- /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 0000000..abd5941 --- /dev/null +++ b/shell/hush_test/hush-heredoc/heredoc7.tests @@ -0,0 +1,3 @@ +cat << _ACEOF +_ASBOX +_ACEOF |