Additional error checks for issuing the windows.appendAtomically warning (git-for-windows#4528)

dscho · dscho · commit cc9e162aa1e7 · 2023-11-20T18:02:25.000+01:00
Another (hopefully clean) PR for showing the error warning about atomic
append on windows after failure on APFS, which returns EBADF not EINVAL.

Signed-off-by: David Lomas &lt;dl3@pale-eds.co.uk&gt;
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -717,7 +717,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 {
 	ssize_t result = write(fd, buf, len);
 
-	if (result < 0 && errno == EINVAL && buf) {
+	if (result < 0 && (errno == EINVAL || errno == EBADF) && buf) {
 		/* check if fd is a pipe */
 		HANDLE h = (HANDLE) _get_osfhandle(fd);
 		if (GetFileType(h) == FILE_TYPE_PIPE)

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)`
`717`	`717`	`{`
`718`	`718`	`ssize_t result = write(fd, buf, len);`
`719`	`719`
`720`		`- if (result < 0 && errno == EINVAL && buf) {`
	`720`	`+ if (result < 0 && (errno == EINVAL \|\| errno == EBADF) && buf) {`
`721`	`721`	`/* check if fd is a pipe */`
`722`	`722`	`HANDLE h = (HANDLE) _get_osfhandle(fd);`
`723`	`723`	`if (GetFileType(h) == FILE_TYPE_PIPE)`