X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=copy.c;h=08a3d388a4c312fca18558b2b8e5dcf027c7afaf;hb=HEAD;hp=20092757d395dfa4af99a6062e5e2cc0fa5e00c3;hpb=1301c6eb412e7c5511b952a12e42c70ad56f028b;p=git.git

diff --git a/copy.c b/copy.c
index 20092757..08a3d388 100644
--- a/copy.c
+++ b/copy.c
@@ -6,29 +6,30 @@ int copy_fd(int ifd, int ofd)
 		int len;
 		char buffer[8192];
 		char *buf = buffer;
-		len = read(ifd, buffer, sizeof(buffer));
+		len = xread(ifd, buffer, sizeof(buffer));
 		if (!len)
 			break;
 		if (len < 0) {
-			if (errno == EAGAIN)
-				continue;
+			int read_error;
+			read_error = errno;
+			close(ifd);
 			return error("copy-fd: read returned %s",
-				     strerror(errno));
+				     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);