summaryrefslogtreecommitdiff
path: root/unpack-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-20 00:18:28 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-20 02:28:16 (GMT)
commit1c15afb9343bca82e687d008ec983a9110ac9c40 (patch)
treeed760b10c0c124e7ec3c1934e4bb1291a8faf0a0 /unpack-objects.c
parent1fdfd05db2f6e6bacd8c8255992fa4a7f1756176 (diff)
downloadgit-1c15afb9343bca82e687d008ec983a9110ac9c40.zip
git-1c15afb9343bca82e687d008ec983a9110ac9c40.tar.gz
git-1c15afb9343bca82e687d008ec983a9110ac9c40.tar.bz2
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 <junkio@cox.net>
Diffstat (limited to 'unpack-objects.c')
-rw-r--r--unpack-objects.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/unpack-objects.c b/unpack-objects.c
index cfd61ae..5c5cb12 100644
--- a/unpack-objects.c
+++ b/unpack-objects.c
@@ -31,12 +31,10 @@ static void * fill(int min)
offset = 0;
}
do {
- int ret = read(0, buffer + len, sizeof(buffer) - len);
+ int ret = xread(0, buffer + len, sizeof(buffer) - len);
if (ret <= 0) {
if (!ret)
die("early EOF");
- if (errno == EAGAIN || errno == EINTR)
- continue;
die("read error on input: %s", strerror(errno));
}
len += ret;
@@ -299,14 +297,9 @@ int main(int argc, char **argv)
/* Write the last part of the buffer to stdout */
while (len) {
- int ret = write(1, buffer + offset, len);
- if (!ret)
- break;
- if (ret < 0) {
- if (errno == EAGAIN || errno == EINTR)
- continue;
+ int ret = xwrite(1, buffer + offset, len);
+ if (ret <= 0)
break;
- }
len -= ret;
offset += ret;
}