Changeset 201796 in webkit

Timestamp:

Jun 7, 2016 11:51:51 PM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GLIB] Implement hardLinkOrCopyFile() in FileSystemGlib
​https://bugs.webkit.org/show_bug.cgi?id=158473

Reviewed by Michael Catanzaro.

It was added in r199230 to be used by IndexedDB blob support, but never implemented for GLib.

• platform/glib/FileSystemGlib.cpp:

(WebCore::hardLinkOrCopyFile):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/glib/FileSystemGlib.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-07  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] Implement hardLinkOrCopyFile() in FileSystemGlib
+        https://bugs.webkit.org/show_bug.cgi?id=158473
+
+        Reviewed by Michael Catanzaro.
+
+        It was added in r199230 to be used by IndexedDB blob support, but never implemented for GLib.
+
+        * platform/glib/FileSystemGlib.cpp:
+        (WebCore::hardLinkOrCopyFile):
+
 2016-06-07  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/WebCore/platform/glib/FileSystemGlib.cpp

@@ -373 +373 @@
 }
 
-bool hardLinkOrCopyFile(const String&, const String&)
-{
-    // FIXME: Implement
-    return false;
-}
-
-}
+bool hardLinkOrCopyFile(const String& source, const String& destination)
+{
+#if OS(WINDOWS)
+    return !!::CopyFile(source.charactersWithNullTermination().data(), destination.charactersWithNullTermination().data(), TRUE);
+#else
+    GUniquePtr<gchar> sourceFilename = unescapedFilename(source);
+    if (!sourceFilename)
+        return false;
+
+    GUniquePtr<gchar> destinationFilename = unescapedFilename(destination);
+    if (!destinationFilename)
+        return false;
+
+    if (!link(sourceFilename.get(), destinationFilename.get()))
+        return true;
+
+    // Hard link failed. Perform a copy instead.
+    GRefPtr<GFile> sourceFile = adoptGRef(g_file_new_for_path(sourceFilename.get()));
+    GRefPtr<GFile> destinationFile = adoptGRef(g_file_new_for_path(destinationFilename.get()));
+    return g_file_copy(sourceFile.get(), destinationFile.get(), G_FILE_COPY_NONE, nullptr, nullptr, nullptr, nullptr);
+#endif
+}
+
+}