Skip to content

Commit 0b5a005

Browse files
ZCubeGit for Windows Build Agent
authored andcommitted
mingw: when running in a Windows container, try to rename() harder
It is a known issue that a rename() can fail with an "Access denied" error at times, when copying followed by deleting the original file works. Let's just fall back to that behavior. Signed-off-by: JiSeop Moon <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 1a0768e commit 0b5a005

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

compat/mingw.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2516,6 +2516,13 @@ int mingw_rename(const char *pold, const char *pnew)
25162516
return 0;
25172517
gle = GetLastError();
25182518

2519+
if (gle == ERROR_ACCESS_DENIED && is_inside_windows_container()) {
2520+
/* Fall back to copy to destination & remove source */
2521+
if (CopyFileW(wpold, wpnew, FALSE) && !mingw_unlink(pold))
2522+
return 0;
2523+
gle = GetLastError();
2524+
}
2525+
25192526
/* revert file attributes on failure */
25202527
if (attrs != INVALID_FILE_ATTRIBUTES)
25212528
SetFileAttributesW(wpnew, attrs);

0 commit comments

Comments
 (0)