averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

xread/xwrite: do not worry about EINTR at calling sites.

Browse Source 
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 <junkio@cox.net>
This commit is contained in:
Junio C Hamano
2005-12-19 16:18:28 -08:00
parent 1fdfd05db2
commit 1c15afb934
9 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
copy.c
View File

@@ -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);