X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=write_or_die.c;h=5c4bc8515ab9484131de7e065e08657315004f8c;hb=667152528df417627e54de6cb281a63a727369af;hp=ab4cb8a69cd6e54c12dac647bb5af1df54fdf6c8;hpb=2ad6ba353aa3815894674a0dee56aa75f8a5fc7b;p=git.git

diff --git a/write_or_die.c b/write_or_die.c
index ab4cb8a69..5c4bc8515 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -1,20 +1,72 @@
 #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)
+{
+	char *p = buf;
+	ssize_t total = 0;
+
+	while (count > 0) {
+		ssize_t loaded = xread(fd, p, count);
+		if (loaded <= 0)
+			return total ? total : loaded;
+		count -= loaded;
+		p += loaded;
+		total += loaded;
+	}
+
+	return total;
+}
+
+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;
+}
+
+void write_or_die(int fd, const void *buf, size_t count)
+{
+	if (write_in_full(fd, buf, count) < 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)
+{
+	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;
 }