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 /csum-file.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 'csum-file.c')
| -rw-r--r-- | csum-file.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/csum-file.c b/csum-file.c index c66b9eb10b..5f9249aeed 100644 --- a/csum-file.c +++ b/csum-file.c @@ -15,7 +15,7 @@ static int sha1flush(struct sha1file *f, unsigned int count) void *buf = f->buffer; for (;;) { - int ret = write(f->fd, buf, count); + int ret = xwrite(f->fd, buf, count); if (ret > 0) { buf += ret; count -= ret; @@ -25,8 +25,6 @@ static int sha1flush(struct sha1file *f, unsigned int count) } if (!ret) die("sha1 file '%s' write error. Out of diskspace", f->name); - if (errno == EAGAIN || errno == EINTR) - continue; die("sha1 file '%s' write error (%s)", f->name, strerror(errno)); } } |