From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 9 Dec 2011 01:11:38 +0000 (-0500)
Subject: commit bash-20090624 snapshot
X-Git-Tag: bash-4.3-alpha~222
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d83a06710109952430da7f0d7879fbcd40bdcde8;p=thirdparty%2Fbash.git

commit bash-20090624 snapshot
---

diff --git a/MANIFEST b/MANIFEST
index 1e1147686..5de586733 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -782,6 +782,7 @@ tests/comsub-eof1.sub	f
 tests/comsub-eof2.sub	f
 tests/comsub-eof3.sub	f
 tests/comsub-eof4.sub	f
+tests/comsub-eof5.sub	f
 tests/comsub-eof.right	f
 tests/comsub-posix.tests	f
 tests/comsub-posix.right	f
diff --git a/support/mk-takehome b/support/mk-takehome
index 6242c76b2..4c212ed6d 100755
--- a/support/mk-takehome
+++ b/support/mk-takehome
@@ -8,6 +8,23 @@ DIR=$PARENT/$FROOT
 TARF=${FROOT}.tar
 SRC=/usr/homes/chet/src/bash/src
 
+fflag= sflag=
+while getopts "fs" opt
+do
+	case $opt in
+	f)	fflag=1 ;;
+	s)	sflag=1 ;;
+	*)	echo "mk-takehome: usage: mk-takehome [-fs]" 2>&1
+		exit 2;;
+	esac
+done
+
+shift $(($OPTIND - 1))
+
+if [ -n "$fflag" ]; then
+	rm -rf "$DIR"
+fi
+
 mkdir $DIR || exit 1
 
 cd $DIR || exit 1
@@ -34,6 +51,6 @@ gzip -v ${TARF}
 
 REMHOST=z4
 
-if [ "$1" = "-s" ]; then
+if [ -n "$sflag" ]; then
 	scp ${TARF}.gz ${REMHOST}:
 fi
diff --git a/tests/comsub-eof.right b/tests/comsub-eof.right
index 4e1146421..452a9c5f0 100644
--- a/tests/comsub-eof.right
+++ b/tests/comsub-eof.right
@@ -7,3 +7,7 @@ hi
 ./comsub-eof3.sub: line 5: syntax error: unexpected end of file
 ./comsub-eof4.sub: line 6: warning: here-document at line 4 delimited by end-of-file (wanted `EOF')
 contents
+./comsub-eof5.sub: line 8: warning: here-document at line 6 delimited by end-of-file (wanted `)')
+hi
+./comsub-eof5.sub: line 13: warning: here-document at line 11 delimited by end-of-file (wanted `EOF')
+hi
diff --git a/tests/comsub-eof.tests b/tests/comsub-eof.tests
index 5980a65f6..f96aeee94 100644
--- a/tests/comsub-eof.tests
+++ b/tests/comsub-eof.tests
@@ -7,3 +7,5 @@ ${THIS_SH} ./comsub-eof2.sub
 ${THIS_SH} ./comsub-eof3.sub
 
 ${THIS_SH} ./comsub-eof4.sub
+
+${THIS_SH} ./comsub-eof5.sub
diff --git a/tests/comsub-eof5.sub b/tests/comsub-eof5.sub
new file mode 100644
index 000000000..3da9107ef
--- /dev/null
+++ b/tests/comsub-eof5.sub
@@ -0,0 +1,9 @@
+echo $(
+cat <<\)
+hi
+))
+
+echo $(
+cat <<\EOF
+hi
+EOF)