Changeset 57182 in webkit

Timestamp:

Apr 6, 2010 6:29:04 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-06 Kinuko Yasuda <​kinuko@chromium.org>

Reviewed by Jian Li.

Add basic FileSystem operations for FileReader/FileWriter support for POSIX (incl. Mac)
​https://bugs.webkit.org/show_bug.cgi?id=36938

No new tests; will be added when we implement upper layers.

• platform/FileSystem.h: (WebCore::):
• platform/posix/FileSystemPOSIX.cpp: (WebCore::openFile): (WebCore::closeFile): (WebCore::seekFile): (WebCore::truncateFile): (WebCore::writeToFile): (WebCore::readFromFile):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-06  Kinuko Yasuda  <kinuko@chromium.org>
+
+        Reviewed by Jian Li.
+
+        Add basic FileSystem operations for FileReader/FileWriter support for POSIX (incl. Mac)
+        https://bugs.webkit.org/show_bug.cgi?id=36938
+
+        No new tests; will be added when we implement upper layers.
+
+        * platform/FileSystem.h:
+        (WebCore::):
+        * platform/posix/FileSystemPOSIX.cpp:
+        (WebCore::openFile):
+        (WebCore::closeFile):
+        (WebCore::seekFile):
+        (WebCore::truncateFile):
+        (WebCore::writeToFile):
+        (WebCore::readFromFile):
+
 2010-04-06  Nicolas Weber  <thakis@chromium.org>
 

trunk/WebCore/platform/FileSystem.h

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
- 
+
 #ifndef FileSystem_h
 #define FileSystem_h
@@ -123 +123 @@
 #endif
 
+enum FileOpenMode {
+    OpenForRead = 0,
+    OpenForWrite
+};
+
+enum FileSeekOrigin {
+    SeekFromBeginning = 0,
+    SeekFromCurrent,
+    SeekFromEnd
+};
+
 bool fileExists(const String&);
 bool deleteFile(const String&);
@@ -142 +153 @@
 // Prefix is what the filename should be prefixed with, not the full path.
 WTF::CString openTemporaryFile(const char* prefix, PlatformFileHandle&);
+PlatformFileHandle openFile(const String& path, FileOpenMode);
 void closeFile(PlatformFileHandle&);
+// Returns the resulting offset from the beginning of the file if successful, -1 otherwise.
+long long seekFile(PlatformFileHandle, long long offset, FileSeekOrigin);
+bool truncateFile(PlatformFileHandle, long long offset);
+// Returns number of bytes actually read if successful, -1 otherwise.
 int writeToFile(PlatformFileHandle, const char* data, int length);
+// Returns number of bytes actually written if successful, -1 otherwise.
+int readFromFile(PlatformFileHandle, char* data, int length);
 
 // Methods for dealing with loadable modules

trunk/WebCore/platform/posix/FileSystemPOSIX.cpp

@@ -31 +31 @@
 
 #include "PlatformString.h"
+#include <errno.h>
+#include <libgen.h>
+#include <sys/stat.h>
+#include <unistd.h>
 #include <wtf/text/CString.h>
-
-#include <sys/stat.h>
-#include <libgen.h>
-#include <unistd.h>
 
 namespace WebCore {
@@ -64 +64 @@
     // unlink(...) returns 0 on successful deletion of the path and non-zero in any other case (including invalid permissions or non-existent file)
     return !unlink(fsRep.data());
+}
+
+PlatformFileHandle openFile(const String& path, FileOpenMode mode)
+{
+    int platformFlag = 0;
+    if (mode == OpenForRead)
+        platformFlag |= O_RDONLY;
+    else if (mode == OpenForWrite)
+        platformFlag |= (O_WRONLY | O_CREAT | O_TRUNC);
+    return open(path.utf8().data(), platformFlag, 0666);
+}
+
+void closeFile(PlatformFileHandle& handle)
+{
+    if (isHandleValid(handle)) {
+        close(handle);
+        handle = invalidPlatformFileHandle;
+    }
+}
+
+long long seekFile(PlatformFileHandle handle, long long offset, FileSeekOrigin origin)
+{
+    int whence = SEEK_SET;
+    switch (origin) {
+    case SeekFromBeginning:
+        whence = SEEK_SET;
+        break;
+    case SeekFromCurrent:
+        whence = SEEK_CUR;
+        break;
+    case SeekFromEnd:
+        whence = SEEK_END;
+        break;
+    default:
+        ASSERT_NOT_REACHED();
+    }
+    return static_cast<long long>(lseek(handle, offset, whence));
+}
+
+bool truncateFile(PlatformFileHandle handle, long long offset)
+{
+    // ftruncate returns 0 to indicate the success.
+    return !ftruncate(handle, offset);
+}
+
+int writeToFile(PlatformFileHandle handle, const char* data, int length)
+{
+    do {
+        int bytesWritten = write(handle, data, static_cast<size_t>(length));
+        if (bytesWritten >= 0)
+            return bytesWritten;
+    } while (errno == EINTR);
+    return -1;
+}
+
+int readFromFile(PlatformFileHandle handle, char* data, int length)
+{
+    do {
+        int bytesRead = read(handle, data, static_cast<size_t>(length));
+        if (bytesRead >= 0)
+            return bytesRead;
+    } while (errno == EINTR);
+    return -1;
 }