1 files changed, 42 insertions, 30 deletions

diff --git a/write_or_die.c b/write_or_die.c
index 6db1d3123d..613c0c3f6e 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -35,49 +35,61 @@ void write_or_die(int fd, const void *buf, size_t count)
 	}
 }
 
-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;
+	ssize_t wcount = 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;
+		wcount = xwrite(fd, p, count);
+		if (wcount <= 0) {
+			if (total)
+				return total;
+			else
+				return wcount;
 		}
-		count -= written;
-		p += written;
+		count -= wcount;
+		p += wcount;
+		total += wcount;
+	}
+
+	return wcount;
+}
+
+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_in_full(int fd, const void *buf, size_t count, const char *msg)
+int write_or_whine(int fd, const void *buf, size_t count, const char *msg)
 {
-	const char *p = buf;
 	ssize_t written;
 
-	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;
+	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;