X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=pkt-line.c;h=355546a1ad844492234dc7ee91528c525af5610a;hb=b90ced0f7da0b8dcdac1aabd8840a23daef25b43;hp=69473046bf717c9b97470d7652c15377dd9fc9d5;hpb=51017101c7a308745ba3c04944457f1dc6a55780;p=git.git

diff --git a/pkt-line.c b/pkt-line.c
index 69473046b..355546a1a 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -5,7 +5,7 @@
  * Write a packetized stream, where each line is preceded by
  * its length (including the header) as a 4-byte hex number.
  * A length of 'zero' means end of stream (and a length of 1-3
- * would be an error). 
+ * would be an error).
  *
  * This is all pretty stupid, but we use this packetized line
  * format to make a streaming format possible without ever
@@ -16,21 +16,21 @@
  * The writing side could use stdio, but since the reading
  * side can't, we stay with pure read/write interfaces.
  */
-static void safe_write(int fd, const void *buf, unsigned n)
+ssize_t safe_write(int fd, const void *buf, ssize_t n)
 {
+	ssize_t nn = n;
 	while (n) {
-		int ret = write(fd, buf, n);
+		int ret = xwrite(fd, buf, n);
 		if (ret > 0) {
-			buf += ret;
+			buf = (char *) buf + ret;
 			n -= ret;
 			continue;
 		}
 		if (!ret)
 			die("write error (disk full?)");
-		if (errno == EAGAIN || errno == EINTR)
-			continue;
 		die("write error (%s)", strerror(errno));
 	}
+	return nn;
 }
 
 /*
@@ -65,17 +65,14 @@ void packet_write(int fd, const char *fmt, ...)
 
 static void safe_read(int fd, void *buffer, unsigned size)
 {
-	int n = 0;
+	size_t n = 0;
 
 	while (n < size) {
-		int ret = read(fd, buffer + n, size - n);
-		if (ret < 0) {
-			if (errno == EINTR || errno == EAGAIN)
-				continue;
+		ssize_t ret = xread(fd, (char *) buffer + n, size - n);
+		if (ret < 0)
 			die("read error (%s)", strerror(errno));
-		}
 		if (!ret)
-			die("unexpected EOF");
+			die("The remote end hung up unexpectedly");
 		n += ret;
 	}
 }