Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-19 19:43:23 +08:00
Code Issues Projects Releases Wiki Activity

cmSystemTools: Teach RenameFile to try for longer on directories

Browse Source 
Issue: #19580
This commit is contained in:
Ron W Moore
2020-08-25 21:22:52 -04:00
committed by Brad King
parent 2f8ef095da
commit b54190a406
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/cmSystemTools.cxx
View File

@@ -809,6 +809,17 @@ WindowsFileRetryInit InitWindowsDirectoryRetry()
return dirInit; return dirInit;
} }
cmSystemTools::WindowsFileRetry GetWindowsRetry(std::wstring const& path)
{
// If we are performing a directory operation, then try and get the
// appropriate timing info.
DWORD const attrs = GetFileAttributesW(path.c_str());
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY)) {
return cmSystemTools::GetWindowsDirectoryRetry();
}
return cmSystemTools::GetWindowsFileRetry();
}
} // end of anonymous namespace } // end of anonymous namespace
cmSystemTools::WindowsFileRetry cmSystemTools::GetWindowsFileRetry() cmSystemTools::WindowsFileRetry cmSystemTools::GetWindowsFileRetry()
@@ -912,7 +923,7 @@ bool cmSystemTools::RenameFile(const std::string& oldname,
fails then remove the read-only attribute from any existing destination. fails then remove the read-only attribute from any existing destination.
Try multiple times since we may be racing against another process Try multiple times since we may be racing against another process
creating/opening the destination file just before our MoveFileEx. */ creating/opening the destination file just before our MoveFileEx. */
WindowsFileRetry retry = cmSystemTools::GetWindowsFileRetry(); WindowsFileRetry retry = GetWindowsRetry(oldname_wstr);
DWORD move_last_error = 0; DWORD move_last_error = 0;
while (!cmMoveFile(oldname_wstr, newname_wstr) && --retry.Count) { while (!cmMoveFile(oldname_wstr, newname_wstr) && --retry.Count) {
move_last_error = GetLastError(); move_last_error = GetLastError();