Merge branch 'ef/mingw-write'

gitster · gitster · commit 7b4e2b7e6aba · 2014-01-27T10:44:59.000-08:00
* ef/mingw-write:
  mingw: remove mingw_write
  prefer xwrite instead of write
diff --git a/builtin/merge.c b/builtin/merge.c
@@ -367,7 +367,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
 			sha1_to_hex(commit->object.sha1));
 		pretty_print_commit(&ctx, commit, &out);
 	}
-	if (write(fd, out.buf, out.len) < 0)
+	if (write_in_full(fd, out.buf, out.len) != out.len)
 		die_errno(_("Writing SQUASH_MSG"));
 	if (close(fd))
 		die_errno(_("Finishing SQUASH_MSG"));
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -304,23 +304,6 @@ int mingw_open (const char *filename, int oflags, ...)
 	return fd;
 }
 
-#undef write
-ssize_t mingw_write(int fd, const void *buf, size_t count)
-{
-	/*
-	 * While write() calls to a file on a local disk are translated
-	 * into WriteFile() calls with a maximum size of 64KB on Windows
-	 * XP and 256KB on Vista, no such cap is placed on writes to
-	 * files over the network on Windows XP.  Unfortunately, there
-	 * seems to be a limit of 32MB-28KB on X64 and 64MB-32KB on x86;
-	 * bigger writes fail on Windows XP.
-	 * So we cap to a nice 31MB here to avoid write failures over
-	 * the net without changing the number of WriteFile() calls in
-	 * the local case.
-	 */
-	return write(fd, buf, min(count, 31 * 1024 * 1024));
-}
-
 static BOOL WINAPI ctrl_ignore(DWORD type)
 {
 	return TRUE;
diff --git a/compat/mingw.h b/compat/mingw.h
@@ -180,9 +180,6 @@ int mingw_rmdir(const char *path);
 int mingw_open (const char *filename, int oflags, ...);
 #define open mingw_open
 
-ssize_t mingw_write(int fd, const void *buf, size_t count);
-#define write mingw_write
-
 int mingw_fgetc(FILE *stream);
 #define fgetc mingw_fgetc
 
diff --git a/streaming.c b/streaming.c
@@ -538,7 +538,7 @@ int stream_blob_to_fd(int fd, unsigned const char *sha1, struct stream_filter *f
 			goto close_and_exit;
 	}
 	if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 ||
-		     write(fd, "", 1) != 1))
+		     xwrite(fd, "", 1) != 1))
 		goto close_and_exit;
 	result = 0;
 
diff --git a/transport-helper.c b/transport-helper.c
@@ -1135,9 +1135,8 @@ static int udt_do_write(struct unidirectional_transfer *t)
 		return 0;	/* Nothing to write. */
 
 	transfer_debug("%s is writable", t->dest_name);
-	bytes = write(t->dest, t->buf, t->bufuse);
-	if (bytes < 0 && errno != EWOULDBLOCK && errno != EAGAIN &&
-		errno != EINTR) {
+	bytes = xwrite(t->dest, t->buf, t->bufuse);
+	if (bytes < 0 && errno != EWOULDBLOCK) {
 		error("write(%s) failed: %s", t->dest_name, strerror(errno));
 		return -1;
 	} else if (bytes > 0) {

Original file line number	Diff line number	Diff line change
`@@ -367,7 +367,7 @@ static void squash_message(struct commit commit, struct commit_list remotehead`
`367`	`367`	`sha1_to_hex(commit->object.sha1));`
`368`	`368`	`pretty_print_commit(&ctx, commit, &out);`
`369`	`369`	`}`
`370`		`- if (write(fd, out.buf, out.len) < 0)`
	`370`	`+ if (write_in_full(fd, out.buf, out.len) != out.len)`
`371`	`371`	`die_errno(_("Writing SQUASH_MSG"));`
`372`	`372`	`if (close(fd))`
`373`	`373`	`die_errno(_("Finishing SQUASH_MSG"));`
Original file line number	Diff line number	Diff line change
`@@ -538,7 +538,7 @@ int stream_blob_to_fd(int fd, unsigned const char sha1, struct stream_filter f`
`538`	`538`	`goto close_and_exit;`
`539`	`539`	`}`
`540`	`540`	`if (kept && (lseek(fd, kept - 1, SEEK_CUR) == (off_t) -1 \|\|`
`541`		`- write(fd, "", 1) != 1))`
	`541`	`+ xwrite(fd, "", 1) != 1))`
`542`	`542`	`goto close_and_exit;`
`543`	`543`	`result = 0;`
`544`	`544`