From 1c15afb9343bca82e687d008ec983a9110ac9c40 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 19 Dec 2005 16:18:28 -0800 Subject: xread/xwrite: do not worry about EINTR at calling sites. We had errno==EINTR check after read(2)/write(2) sprinkled all over the places, always doing continue. Consolidate them into xread()/xwrite() wrapper routines. Credits for suggestion goes to HPA -- bugs are mine. Signed-off-by: Junio C Hamano --- copy.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) (limited to 'copy.c') diff --git a/copy.c b/copy.c index e1cd5d0650..7100eedbc3 100644 --- a/copy.c +++ b/copy.c @@ -6,32 +6,27 @@ 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) { 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) return error("copy-fd: write returned 0"); - if (errno == EAGAIN || errno == EINTR) - continue; - return error("copy-fd: write returned %s", - strerror(errno)); + else + return error("copy-fd: write returned %s", + strerror(errno)); } } close(ifd); -- cgit v1.2.3