Changeset 152649 in webkit

Timestamp:

Jul 15, 2013 11:22:49 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[Curl] Download does not replace existing file.
​https://bugs.webkit.org/show_bug.cgi?id=118356

Patch by ​peavo@outlook.com <​peavo@outlook.com> on 2013-07-15
Reviewed by Brent Fulgham.

If the download target file already exists, it is not replaced after the download has finished.
At this point, the user would have already approved to replace the file, so it should be replaced.

• platform/network/curl/CurlDownload.cpp:

(CurlDownload::moveFileToDestination): Move file and replace it if it already exists.
If the new file is on a different volume, do a copy/delete operation.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/CurlDownload.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-07-15  peavo@outlook.com  <peavo@outlook.com>
+
+        [Curl] Download does not replace existing file.
+        https://bugs.webkit.org/show_bug.cgi?id=118356
+
+        Reviewed by Brent Fulgham.
+
+        If the download target file already exists, it is not replaced after the download has finished.
+        At this point, the user would have already approved to replace the file, so it should be replaced.
+
+        * platform/network/curl/CurlDownload.cpp:
+        (CurlDownload::moveFileToDestination): Move file and replace it if it already exists.
+        If the new file is on a different volume, do a copy/delete operation.
+
 2013-07-15  Luciano Wolf  <luciano.wolf@openbossa.org>
 

trunk/Source/WebCore/platform/network/curl/CurlDownload.cpp

@@ -300 +300 @@
         return;
 
-    ::MoveFile(m_tempPath.charactersWithNullTermination().data(), m_destination.charactersWithNullTermination().data());
+    ::MoveFileEx(m_tempPath.charactersWithNullTermination().data(), m_destination.charactersWithNullTermination().data(), MOVEFILE_COPY_ALLOWED | MOVEFILE_REPLACE_EXISTING);
 }