X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=write_or_die.c;h=5c4bc8515ab9484131de7e065e08657315004f8c;hb=76db9dec8132d4377f6c32e4d45eb75fa0cc7a9a;hp=650f13fc012b14a6aaa62534727d4ef9cdce58bd;hpb=825cee7b285d9c733e9aec03cf4362e8029ee1c1;p=git.git

diff --git a/write_or_die.c b/write_or_die.c
index 650f13fc0..5c4bc8515 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,67 +1,71 @@
 #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;
 
 	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));
-		}
-		count -= written;
-		p += written;
+		ssize_t loaded = xread(fd, p, count);
+		if (loaded <= 0)
+			return total ? total : loaded;
+		count -= loaded;
+		p += loaded;
+		total += loaded;
 	}
+
+	return total;
 }
 
-int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
+int write_in_full(int fd, const void *buf, size_t count)
 {
 	const char *p = buf;
-	ssize_t written;
+	ssize_t total = 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;
+		ssize_t written = xwrite(fd, p, count);
+		if (written < 0)
+			return -1;
+		if (!written) {
+			errno = ENOSPC;
+			return -1;
 		}
 		count -= written;
 		p += written;
+		total += written;
 	}
 
-	return 1;
+	return total;
 }
 
-int write_in_full(int fd, const void *buf, size_t count, const char *msg)
+void write_or_die(int fd, const void *buf, size_t count)
 {
-	const char *p = buf;
-	ssize_t written;
+	if (write_in_full(fd, buf, count) < 0) {
+		if (errno == EPIPE)
+			exit(0);
+		die("write error (%s)", strerror(errno));
+	}
+}
 
-	while (count > 0) {
-		written = xwrite(fd, p, 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;
-		}
-		count -= written;
-		p += written;
+int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg)
+{
+	if (write_in_full(fd, buf, count) < 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)
+{
+	if (write_in_full(fd, buf, count) < 0) {
+		fprintf(stderr, "%s: write error (%s)\n",
+			msg, strerror(errno));
+		return 0;
 	}
 
 	return 1;