From 2c59af7dcafb6e26fee53be61c180cfc7a310ed5 Mon Sep 17 00:00:00 2001 From: "huanr@chromium.org" Date: Wed, 11 Mar 2009 18:37:48 +0000 Subject: file_util::Move fails on Windows if moving a directory across volumes. This change adds a CopyAndDeleteDirectory function, and Move falls back to CopyAndDeleteDirectory if moving directory fails. BUG=8505 Review URL: http://codereview.chromium.org/43069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11460 0039d316-1c4b-4281-b951-d872f2087c98 --- base/file_util_win.cc | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) (limited to 'base/file_util_win.cc') diff --git a/base/file_util_win.cc b/base/file_util_win.cc index 22c24cd..45c0afde 100644 --- a/base/file_util_win.cc +++ b/base/file_util_win.cc @@ -101,8 +101,16 @@ bool Move(const FilePath& from_path, const FilePath& to_path) { to_path.value().length() >= MAX_PATH) { return false; } - return (MoveFileEx(from_path.value().c_str(), to_path.value().c_str(), - MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING) != 0); + if (MoveFileEx(from_path.value().c_str(), to_path.value().c_str(), + MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING) != 0) + return true; + if (DirectoryExists(from_path)) { + // MoveFileEx fails if moving directory across volumes. We will simulate + // the move by using Copy and Delete. Ideally we could check whether + // from_path and to_path are indeed in different volumes. + return CopyAndDeleteDirectory(from_path, to_path); + } + return false; } bool CopyFile(const FilePath& from_path, const FilePath& to_path) { @@ -167,6 +175,21 @@ bool CopyDirectory(const FilePath& from_path, const FilePath& to_path, return ShellCopy(directory, to_path, false); } +bool CopyAndDeleteDirectory(const FilePath& from_path, + const FilePath& to_path) { + if (CopyDirectory(from_path, to_path, true)) { + if (Delete(from_path, true)) { + return true; + } + // Like Move, this function is not transactional, so we just + // leave the copied bits behind if deleting from_path fails. + // If to_path exists previously then we have already overwritten + // it by now, we don't get better off by deleting the new bits. + } + return false; +} + + bool PathExists(const FilePath& path) { return (GetFileAttributes(path.value().c_str()) != INVALID_FILE_ATTRIBUTES); } -- cgit v1.1