X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=copy.c;h=c225d1b0ff0a67e637f7200ab5c2a917b550af4f;hb=5410a02ab9e6a1987147724f8ea65e6a077b3832;hp=e1cd5d06503d93f6b400a3911e6b61ff327190ca;hpb=069b20a198f171512a1d2d2163b40f70c94f5257;p=git.git

diff --git a/copy.c b/copy.c
index e1cd5d065..c225d1b0f 100644
--- a/copy.c
+++ b/copy.c
@@ -3,38 +3,34 @@
 int copy_fd(int ifd, int ofd)
 {
 	while (1) {
-		int len;
 		char buffer[8192];
 		char *buf = buffer;
-		len = read(ifd, buffer, sizeof(buffer));
+		ssize_t len = xread(ifd, buffer, sizeof(buffer));
 		if (!len)
 			break;
 		if (len < 0) {
 			int read_error;
-			if (errno == EAGAIN)
-				continue;
 			read_error = errno;
 			close(ifd);
 			return error("copy-fd: read returned %s",
 				     strerror(read_error));
 		}
-		while (1) {
-			int written = write(ofd, buf, len);
+		while (len) {
+			int written = xwrite(ofd, buf, len);
 			if (written > 0) {
 				buf += written;
 				len -= written;
-				if (!len)
-					break;
 			}
-			if (!written)
+			else if (!written) {
+				close(ifd);
 				return error("copy-fd: write returned 0");
-			if (errno == EAGAIN || errno == EINTR)
-				continue;
-			return error("copy-fd: write returned %s",
-				     strerror(errno));
+			} else {
+				close(ifd);
+				return error("copy-fd: write returned %s",
+					     strerror(errno));
+			}
 		}
 	}
 	close(ifd);
 	return 0;
 }
-