X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=write_or_die.c;h=a119e1d208445093dd1d2869729eca9435aa020e;hb=c326246accf36bc070b326773df2b9ec1c336037;hp=bfe4eeb6494c7076bf7f319cf11628f586142aa5;hpb=69de8cc8527dc45a7aef76e8f1ace45b509b3712;p=git.git

diff --git a/write_or_die.c b/write_or_die.c
index bfe4eeb64..a119e1d20 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,44 +1,107 @@
 #include "cache.h"
 
-void write_or_die(int fd, const void *buf, size_t count)
+int read_in_full(int fd, void *buf, size_t count)
 {
-	const char *p = buf;
-	ssize_t written;
+	char *p = buf;
+	ssize_t total = 0;
+	ssize_t loaded = 0;
 
 	while (count > 0) {
-		written = xwrite(fd, p, count);
-		if (written == 0)
-			die("disk full?");
-		else if (written < 0) {
-			if (errno == EPIPE)
-				exit(0);
-			die("write error (%s)", strerror(errno));
+		loaded = xread(fd, p, count);
+		if (loaded <= 0) {
+			if (total)
+				return total;
+			else
+				return loaded;
 		}
-		count -= written;
-		p += written;
+		count -= loaded;
+		p += loaded;
+		total += loaded;
 	}
+
+	return total;
 }
 
-int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
+void read_or_die(int fd, void *buf, size_t count)
+{
+	ssize_t loaded;
+
+	loaded = read_in_full(fd, buf, count);
+	if (loaded == 0)
+		die("unexpected end of file");
+	else if (loaded < 0)
+		die("read error (%s)", strerror(errno));
+}
+
+int write_in_full(int fd, const void *buf, size_t count)
 {
 	const char *p = buf;
-	ssize_t written;
+	ssize_t total = 0;
+	ssize_t written = 0;
 
 	while (count > 0) {
 		written = xwrite(fd, p, count);
-		if (written == 0) {
-			fprintf(stderr, "%s: disk full?\n", msg);
-			return 0;
-		}
-		else if (written < 0) {
-			if (errno == EPIPE)
-				exit(0);
-			fprintf(stderr, "%s: write error (%s)\n",
-				msg, strerror(errno));
-			return 0;
+		if (written <= 0) {
+			if (total)
+				return total;
+			else
+				return written;
 		}
 		count -= written;
 		p += written;
+		total += written;
+	}
+
+	return total;
+}
+
+void write_or_die(int fd, const void *buf, size_t count)
+{
+	ssize_t written;
+
+	written = write_in_full(fd, buf, count);
+	if (written == 0)
+		die("disk full?");
+	else if (written < 0) {
+		if (errno == EPIPE)
+			exit(0);
+		die("write error (%s)", strerror(errno));
+	}
+}
+
+int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
+{
+	ssize_t written;
+
+	written = write_in_full(fd, buf, count);
+	if (written == 0) {
+		fprintf(stderr, "%s: disk full?\n", msg);
+		return 0;
+	}
+	else if (written < 0) {
+		if (errno == EPIPE)
+			exit(0);
+		fprintf(stderr, "%s: write error (%s)\n",
+			msg, strerror(errno));
+		return 0;
+	}
+
+	return 1;
+}
+
+int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
+{
+	ssize_t written;
+
+	written = write_in_full(fd, buf, count);
+	if (written == 0) {
+		fprintf(stderr, "%s: disk full?\n", msg);
+		return 0;
+	}
+	else if (written < 0) {
+		fprintf(stderr, "%s: write error (%s)\n",
+			msg, strerror(errno));
+		return 0;
 	}
 
 	return 1;