X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=write_or_die.c;h=5c4bc8515ab9484131de7e065e08657315004f8c;hb=957d6ea78fcbe71481a6f46a58768e100f7908e0;hp=613c0c3f6e90cc6a1b7ae9c0ade4e5c10dc25029;hpb=e08140568a131bcd26e64a0bc8188040847be998;p=git.git

diff --git a/write_or_die.c b/write_or_die.c
index 613c0c3f6..5c4bc8515 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,72 +1,55 @@
 #include "cache.h"
 
-void read_or_die(int fd, void *buf, size_t count)
+int read_in_full(int fd, void *buf, size_t count)
 {
 	char *p = buf;
-	ssize_t loaded;
+	ssize_t total = 0;
 
 	while (count > 0) {
-		loaded = xread(fd, p, count);
-		if (loaded == 0)
-			die("unexpected end of file");
-		else if (loaded < 0)
-			die("read error (%s)", strerror(errno));
+		ssize_t loaded = xread(fd, p, count);
+		if (loaded <= 0)
+			return total ? total : loaded;
 		count -= loaded;
 		p += loaded;
+		total += loaded;
 	}
+
+	return total;
 }
 
-void write_or_die(int fd, const void *buf, size_t count)
+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)
-			die("disk full?");
-		else if (written < 0) {
-			if (errno == EPIPE)
-				exit(0);
-			die("write error (%s)", strerror(errno));
+		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 total;
 }
 
-int write_in_full(int fd, const void *buf, size_t count)
+void write_or_die(int fd, const void *buf, size_t count)
 {
-	const char *p = buf;
-	ssize_t total = 0;
-	ssize_t wcount = 0;
-
-	while (count > 0) {
-		wcount = xwrite(fd, p, count);
-		if (wcount <= 0) {
-			if (total)
-				return total;
-			else
-				return wcount;
-		}
-		count -= wcount;
-		p += wcount;
-		total += wcount;
+	if (write_in_full(fd, buf, count) < 0) {
+		if (errno == EPIPE)
+			exit(0);
+		die("write error (%s)", strerror(errno));
 	}
-
-	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 (write_in_full(fd, buf, count) < 0) {
 		if (errno == EPIPE)
 			exit(0);
 		fprintf(stderr, "%s: write error (%s)\n",
@@ -79,14 +62,7 @@ int write_or_whine_pipe(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)
 {
-	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 (write_in_full(fd, buf, count) < 0) {
 		fprintf(stderr, "%s: write error (%s)\n",
 			msg, strerror(errno));
 		return 0;