summaryrefslogtreecommitdiff
path: root/pkt-line.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 /pkt-line.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 'pkt-line.c')
-rw-r--r--pkt-line.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/pkt-line.c b/pkt-line.c
index 6947304..bb3bab0 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -19,7 +19,7 @@
static void safe_write(int fd, const void *buf, unsigned n)
{
while (n) {
- int ret = write(fd, buf, n);
+ int ret = xwrite(fd, buf, n);
if (ret > 0) {
buf += ret;
n -= ret;
@@ -27,8 +27,6 @@ static void safe_write(int fd, const void *buf, unsigned n)
}
if (!ret)
die("write error (disk full?)");
- if (errno == EAGAIN || errno == EINTR)
- continue;
die("write error (%s)", strerror(errno));
}
}
@@ -68,12 +66,9 @@ static void safe_read(int fd, void *buffer, unsigned size)
int n = 0;
while (n < size) {
- int ret = read(fd, buffer + n, size - n);
- if (ret < 0) {
- if (errno == EINTR || errno == EAGAIN)
- continue;
+ int ret = xread(fd, buffer + n, size - n);
+ if (ret < 0)
die("read error (%s)", strerror(errno));
- }
if (!ret)
die("unexpected EOF");
n += ret;