[BusyBox-cvs] busybox/libbb copyfd.c,1.10,1.11

Glenn McGrath bug1 at busybox.net
Mon Feb 23 08:11:10 UTC 2004


Update of /var/cvs/busybox/libbb
In directory nail:/tmp/cvs-serv12822/libbb

Modified Files:
	copyfd.c 
Log Message:
bb_full_fd_action was incorrectly returning an error message causing 
major breaking.


Index: copyfd.c
===================================================================
RCS file: /var/cvs/busybox/libbb/copyfd.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- a/copyfd.c	21 Feb 2004 09:20:55 -0000	1.10
+++ b/copyfd.c	23 Feb 2004 08:11:07 -0000	1.11
@@ -50,8 +50,8 @@
 		}
 
 		read_actual = safe_read(src_fd, buffer, read_try);
-		if ((read_actual > 0) && (dst_fd >= 0)) {
-			if (bb_full_write(dst_fd, buffer, (size_t) read_actual) != read_actual) {
+		if (read_actual > 0) {
+			if ((dst_fd >= 0) && (bb_full_write(dst_fd, buffer, (size_t) read_actual) != read_actual)) {
 				bb_perror_msg(bb_msg_write_error);	/* match Read error below */
 				break;
 			}




More information about the busybox-cvs mailing list