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

dscho · Git for Windows Build Agent · commit 43f7efb0ba23 · 2023-08-07T22:21:08.000Z
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
@@ -948,7 +948,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
`@@ -948,7 +948,7 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)`
`948`	`948`	`{`
`949`	`949`	`ssize_t result = write(fd, buf, len);`
`950`	`950`
`951`		`- if (result < 0 && errno == EINVAL && buf) {`
	`951`	`+ if (result < 0 && (errno == EINVAL \|\| errno == EBADF) && buf) {`
`952`	`952`	`/* check if fd is a pipe */`
`953`	`953`	`HANDLE h = (HANDLE) _get_osfhandle(fd);`
`954`	`954`	`if (GetFileType(h) == FILE_TYPE_PIPE)`