From 3eddd98be31342af81705faf00234b954ff447cf Mon Sep 17 00:00:00 2001 From: Francois Pichet Date: Thu, 30 Sep 2010 00:44:58 +0000 Subject: Revert r114320(move file = copy + delete on Win32). r115040 is a better solution for the Win32 ACCESS_DENIED lit error. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@115114 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/System/Win32/Path.inc | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lib/System') diff --git a/lib/System/Win32/Path.inc b/lib/System/Win32/Path.inc index 64e7025fc9..4a6dbd3ddf 100644 --- a/lib/System/Win32/Path.inc +++ b/lib/System/Win32/Path.inc @@ -745,19 +745,12 @@ bool Path::getMagicNumber(std::string& Magic, unsigned len) const { return true; } -// Implements renamePathOnDisk as a CopyFile + eraseFromDisk on Windows. -// Using MoveFileEx was causing mysterious ACCESS_DENIED error when used -// within a multithreaded lit/python context. -// FIXME: put back MoveFileEx when the source of the problem is resolved. bool Path::renamePathOnDisk(const Path& newName, std::string* ErrMsg) { - if (*this == newName) - return false; - - if (CopyFile(newName, *this, ErrMsg)) - return true; - - return eraseFromDisk(true, ErrMsg); + if (!MoveFileEx(path.c_str(), newName.c_str(), MOVEFILE_REPLACE_EXISTING)) + return MakeErrMsg(ErrMsg, "Can't move '" + path + "' to '" + newName.path + + "': "); + return false; } bool -- cgit v1.2.3