# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1210087314 0
# Node ID 7b86145ce8ecc3ef634385e60c8aa29703926318
# Parent  686bb38ec018bbad9ffddb4f22b9501b4a686393
busybox/script: catch EOF (was hanging with screen=text)

diff -r 686bb38ec018 -r 7b86145ce8ec busybox/receipt
--- a/busybox/receipt	Tue May 06 15:00:52 2008 +0200
+++ b/busybox/receipt	Tue May 06 15:21:54 2008 +0000
@@ -15,15 +15,20 @@
 compile_rules()
 {
     cd $PACKAGE-$VERSION
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-patch.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-vcsa2txt.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-dhcpc.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mkdir.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-cpio-mtime.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-unlzma.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-tftp.u
-    patch -p1 < ../stuff/$PACKAGE-$VERSION-tar.u || exit 1
+    while read file; do
+    	patch -p1 < ../stuff/$file || return 1
+    done <<EOT
+$PACKAGE-$VERSION-patch.u
+$PACKAGE-$VERSION-vcsa2txt.u
+$PACKAGE-$VERSION-cpio.u
+$PACKAGE-$VERSION-dhcpc.u
+$PACKAGE-$VERSION-cpio-mkdir.u
+$PACKAGE-$VERSION-cpio-mtime.u
+$PACKAGE-$VERSION-unlzma.u
+$PACKAGE-$VERSION-tftp.u
+$PACKAGE-$VERSION-tar.u
+$PACKAGE-$VERSION-script.u
+EOT
     cp ../stuff/$PACKAGE-$VERSION.config .config
     make oldconfig
     make && make install
diff -r 686bb38ec018 -r 7b86145ce8ec busybox/stuff/busybox-1.10.1-script.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/busybox/stuff/busybox-1.10.1-script.u	Tue May 06 15:21:54 2008 +0000
@@ -0,0 +1,12 @@
+--- busybox-1.10.1/util-linux/script.c
++++ busybox-1.10.1/util-linux/script.c
+@@ -132,8 +132,7 @@
+ 				count = safe_read(pty, buf, sizeof(buf));
+ 				if (count <= 0 && errno != EAGAIN) {
+ 					/* err/eof: don't read anymore */
+-					pfd[1].revents = 0;
+-					fd_count--;
++					break;
+ 				}
+ 				if (count > 0) {
+ 					full_write(1, buf, count);