Changeset 238782 in webkit

Timestamp:

Dec 1, 2018 11:34:44 AM (5 years ago)

Author:

chris.reid@sony.com

Message:

Add generic implementations to FileSystemPOSIX.cpp
​https://bugs.webkit.org/show_bug.cgi?id=192263

Reviewed by Yusuke Suzuki.

No new tests, no change in behavior.

Add generic FileSystemPOSIX implementations for:

• stringFromFileSystemRepresentation
• fileSystemRepresentation
• moveFile
• getVolumeFreeSpace

Also removing an unneeded PLATFORM(GTK) check since GTK is only using FileSystemGlib

• platform/posix/FileSystemPOSIX.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/posix/FileSystemPOSIX.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-01  Christopher Reid  <chris.reid@sony.com>
+
+        Add generic implementations to FileSystemPOSIX.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=192263
+
+        Reviewed by Yusuke Suzuki.
+
+        No new tests, no change in behavior.
+
+        Add generic FileSystemPOSIX implementations for:
+            - stringFromFileSystemRepresentation
+            - fileSystemRepresentation
+            - moveFile
+            - getVolumeFreeSpace
+
+        Also removing an unneeded PLATFORM(GTK) check since GTK is only using FileSystemGlib
+
+        * platform/posix/FileSystemPOSIX.cpp:
+
 2018-12-01  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/platform/posix/FileSystemPOSIX.cpp

@@ -38 +38 @@
 #include <stdio.h>
 #include <sys/stat.h>
+#include <sys/statvfs.h>
 #include <sys/types.h>
 #include <unistd.h>
@@ -382 +383 @@
 }
 
-#if !OS(DARWIN) || PLATFORM(GTK)
+#if !PLATFORM(COCOA)
+String stringFromFileSystemRepresentation(const char* path)
+{
+    if (!path)
+        return String();
+
+    return String::fromUTF8(path);
+}
+
+CString fileSystemRepresentation(const String& path)
+{
+    return path.utf8();
+}
+
+bool moveFile(const String& oldPath, const String& newPath)
+{
+    auto oldFilename = fileSystemRepresentation(oldPath);
+    if (oldFilename.isNull())
+        return false;
+
+    auto newFilename = fileSystemRepresentation(newPath);
+    if (newFilename.isNull())
+        return false;
+
+    return rename(oldFilename.data(), newFilename.data()) != -1;
+}
+
+bool getVolumeFreeSpace(const String& path, uint64_t& freeSpace)
+{
+    struct statvfs fileSystemStat;
+    if (statvfs(fileSystemRepresentation(path).data(), &fileSystemStat)) {
+        freeSpace = fileSystemStat.f_bavail * fileSystemStat.f_frsize;
+        return true;
+    }
+    return false;
+}
+#endif
+
+#if !OS(DARWIN)
 String openTemporaryFile(const String& prefix, PlatformFileHandle& handle)
 {