X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=write_or_die.c;h=4c29255df1b637f93ab3d59e0dcab1fa3b40e10b;hb=4b951b7eb0a4abf7db301bc6dbf8a0cf1b0057d0;hp=630be4cb9414b1686a5ad86a4d5166f2828096f1;hpb=4ace4fc584f48d5b8df957c4462cf5c7c58ab100;p=git.git

diff --git a/write_or_die.c b/write_or_die.c
index 630be4cb9..4c29255df 100644
--- a/write_or_die.c
+++ b/write_or_die.c
@@ -34,50 +34,17 @@ void maybe_flush_or_die(FILE *f, const char *desc)
 			return;
 	}
 	if (fflush(f)) {
-		if (errno == EPIPE)
+		/*
+		 * On Windows, EPIPE is returned only by the first write()
+		 * after the reading end has closed its handle; subsequent
+		 * write()s return EINVAL.
+		 */
+		if (errno == EPIPE || errno == EINVAL)
 			exit(0);
 		die("write failure on %s: %s", desc, strerror(errno));
 	}
 }
 
-ssize_t 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;
-}
-
-ssize_t write_in_full(int fd, const void *buf, size_t count)
-{
-	const char *p = buf;
-	ssize_t total = 0;
-
-	while (count > 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 total;
-}
-
 void fsync_or_die(int fd, const char *msg)
 {
 	if (fsync(fd) < 0) {