@matheusbsbs / matheus-bagliano / commits / 680e0b4524
Fork 0

mingw: improve performance of mingw_unlink()

Update mingw_unlink() to first try to delete the file with existing permissions before trying to force it. Windows throws an error when trying to delete a read-only file. The mingw_unlink() compatibility wrapper always tries to _wchmod(666) the file before calling _wunlink() to avoid that error. However, since most files in the worktree are already writable, this is usually wasted effort. Update mingw_unlink() to just call DeleteFileW() directly and if that succeeds return. If that fails, fall back into the existing code path to update the permissions and use _wunlink() to get the existing error code mapping. Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff Hostetler committed Aug 17, 2020 at 10:37 UTC 680e0b4524482c4bb679030188f6ae8db4caff06
1 file changed +3
compat/mingw.c
+3
@@ -290,6 +290,9 @@ int mingw_unlink(const char *pathname)
290 if (xutftowcs_path(wpathname, pathname) < 0)
291 return -1;
292
293 + if (DeleteFileW(wpathname))
294 + return 0;
295 +
296 /* read-only files cannot be removed */
297 _wchmod(wpathname, 0666);
298 while ((ret = _wunlink(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) {