diff options
author | Junio C Hamano <junkio@cox.net> | 2005-12-19 16:18:28 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-12-19 18:28:16 -0800 |
commit | 1c15afb9343bca82e687d008ec983a9110ac9c40 (patch) | |
tree | ed760b10c0c124e7ec3c1934e4bb1291a8faf0a0 /unpack-objects.c | |
parent | 1fdfd05db2f6e6bacd8c8255992fa4a7f1756176 (diff) | |
download | git-1c15afb9343bca82e687d008ec983a9110ac9c40.tar.gz |
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.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/unpack-objects.c b/unpack-objects.c index cfd61ae6b0..5c5cb12f6f 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; } |