Merge branch 'js/access-nul-emulation-on-windows'

gitster · gitster · commit 4090b6973b4c · 2021-04-20T17:23:37.000-07:00
Portability fix.

* js/access-nul-emulation-on-windows:
  msvc: avoid calling `access("NUL", flags)`
diff --git a/compat/mingw.c b/compat/mingw.c
@@ -685,6 +685,8 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 int mingw_access(const char *filename, int mode)
 {
 	wchar_t wfilename[MAX_PATH];
+	if (!strcmp("nul", filename) || !strcmp("/dev/null", filename))
+		return 0;
 	if (xutftowcs_path(wfilename, filename) < 0)
 		return -1;
 	/* X_OK is not supported by the MSVCRT version */

Original file line number	Diff line number	Diff line change
`@@ -685,6 +685,8 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)`
`685`	`685`	`int mingw_access(const char *filename, int mode)`
`686`	`686`	`{`
`687`	`687`	`wchar_t wfilename[MAX_PATH];`
	`688`	`+ if (!strcmp("nul", filename) \|\| !strcmp("/dev/null", filename))`
	`689`	`+ return 0;`
`688`	`690`	`if (xutftowcs_path(wfilename, filename) < 0)`
`689`	`691`	`return -1;`
`690`	`692`	`/* X_OK is not supported by the MSVCRT version */`