Port base/files/file_util_proxy to Native Client.

base/platform_file_posix.cc

Index: base/platform_file_posix.cc
diff --git a/base/platform_file_posix.cc b/base/platform_file_posix.cc
index 7e6335e88451a090c54a6370f75b5a0122a6b8b3..989d4d9a88e13a6662c44acd57db6e807787e0c4 100644
--- a/base/platform_file_posix.cc
+++ b/base/platform_file_posix.cc
@@ -27,7 +27,9 @@ COMPILE_ASSERT(PLATFORM_FILE_FROM_BEGIN   == SEEK_SET &&
                PLATFORM_FILE_FROM_CURRENT == SEEK_CUR &&
                PLATFORM_FILE_FROM_END     == SEEK_END, whence_matches_system);
 
-#if defined(OS_BSD) || defined(OS_MACOSX)
+namespace {
+
+#if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
 typedef struct stat stat_wrapper_t;
 static int CallFstat(int fd, stat_wrapper_t *sb) {
   base::ThreadRestrictions::AssertIOAllowed();
@@ -41,6 +43,84 @@ static int CallFstat(int fd, stat_wrapper_t *sb) {
 }
 #endif
 
+// TODO(bbudge) Remove NaCl workarounds when it implements pread and pwrite.

[brettw, 2013/07/11 18:02:43]

Probably this comment should be more generic (since there's much more than
pread/write.

[bbudge, 2013/07/11 20:08:23]

I moved the comment to just above DoPread. It's likely that I'll get to it
before the next branch. For the others, I think it's very unlikely that they'll
be available in NaCl soon if ever, and I'd rather not create a permanent TODO.

[bbudge, 2013/07/11 20:13:18]

Added comments about why these are necessary.

+#if !defined(OS_NACL)
+static int DoPread(PlatformFile file, char* data, int size, int64 offset) {
+  return HANDLE_EINTR(pread(file, data, size, offset));
+}
+
+static int DoPwrite(PlatformFile file, const char* data, int size,
+                      int64 offset) {
+  return HANDLE_EINTR(pwrite(file, data, size, offset));
+}
+
+static bool IsOpenAppend(PlatformFile file) {
+  return (fcntl(file, F_GETFL) & O_APPEND) != 0;
+}
+
+static int CallFtruncate(PlatformFile file, int64 length) {
+  return HANDLE_EINTR(ftruncate(file, length));
+}
+
+static int CallFsync(PlatformFile file) {
+  return HANDLE_EINTR(fsync(file));
+}
+
+static int CallFutimes(PlatformFile file, const struct timeval times[2]) {
+#ifdef __USE_XOPEN2K8
+  // futimens should be available, but futimes might not be
+  // http://pubs.opengroup.org/onlinepubs/9699919799/
+
+  timespec ts_times[2];
+  ts_times[0].tv_sec  = times[0].tv_sec;
+  ts_times[0].tv_nsec = times[0].tv_usec * 1000;
+  ts_times[1].tv_sec  = times[1].tv_sec;
+  ts_times[1].tv_nsec = times[1].tv_usec * 1000;
+
+  return futimens(file, ts_times);
+#else
+  return futimes(file, times);
+#endif
+}
+#else
+static int DoPread(PlatformFile file, char* data, int size, int64 offset) {
+  lseek(file, static_cast<off_t>(offset), SEEK_SET);
+  return HANDLE_EINTR(read(file, data, size));
+}
+
+static int DoPwrite(PlatformFile file, const char* data, int size,
+                      int64 offset) {
+  lseek(file, static_cast<off_t>(offset), SEEK_SET);
+  return HANDLE_EINTR(write(file, data, size));
+}
+
+static bool IsOpenAppend(PlatformFile file) {
+  // NaCl doesn't implement fcntl. Since NaCl's write conforms to the POSIX
+  // standard and always appends if the file is opened with O_APPEND, just
+  // return false here.
+  return false;
+}
+
+static int CallFtruncate(PlatformFile file, int64 length) {
+  NOTIMPLEMENTED();  // NaCl doesn't implement ftruncate.
+  return 0;
+}
+
+static int CallFsync(PlatformFile file) {
+  NOTIMPLEMENTED();  // NaCl doesn't implement fsync.
+  return 0;
+}
+
+static int CallFutimes(PlatformFile file, const struct timeval times[2]) {
+  NOTIMPLEMENTED();  // NaCl doesn't implement futimes.
+  return 0;
+}
+#endif  // !defined(OS_NACL)
+
+}  // namespace
+
+// NaCl doesn't implement system calls to open files directly.
+#if !defined(OS_NACL)
 // TODO(erikkay): does it make sense to support PLATFORM_FILE_EXCLUSIVE_* here?
 PlatformFile CreatePlatformFileUnsafe(const FilePath& name,
                                       int flags,
@@ -139,6 +219,7 @@ PlatformFile CreatePlatformFileUnsafe(const FilePath& name,
 FILE* FdopenPlatformFile(PlatformFile file, const char* mode) {
   return fdopen(file, mode);
 }
+#endif  // !defined(OS_NACL)
 
 bool ClosePlatformFile(PlatformFile file) {
   base::ThreadRestrictions::AssertIOAllowed();
@@ -163,8 +244,8 @@ int ReadPlatformFile(PlatformFile file, int64 offset, char* data, int size) {
   int bytes_read = 0;
   int rv;
   do {
-    rv = HANDLE_EINTR(pread(file, data + bytes_read,
-                            size - bytes_read, offset + bytes_read));
+    rv = DoPread(file, data + bytes_read,
+                   size - bytes_read, offset + bytes_read);
     if (rv <= 0)
       break;
 
@@ -198,7 +279,7 @@ int ReadPlatformFileNoBestEffort(PlatformFile file, int64 offset,
   if (file < 0)
     return -1;
 
-  return HANDLE_EINTR(pread(file, data, size, offset));
+  return DoPread(file, data, size, offset);
 }
 
 int ReadPlatformFileCurPosNoBestEffort(PlatformFile file,
@@ -214,7 +295,7 @@ int WritePlatformFile(PlatformFile file, int64 offset,
                       const char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
 
-  if (fcntl(file, F_GETFL) & O_APPEND)
+  if (IsOpenAppend(file))
     return WritePlatformFileAtCurrentPos(file, data, size);
 
   if (file < 0 || size < 0)
@@ -223,8 +304,8 @@ int WritePlatformFile(PlatformFile file, int64 offset,
   int bytes_written = 0;
   int rv;
   do {
-    rv = HANDLE_EINTR(pwrite(file, data + bytes_written,
-                             size - bytes_written, offset + bytes_written));
+    rv = DoPwrite(file, data + bytes_written,
+                    size - bytes_written, offset + bytes_written);
     if (rv <= 0)
       break;
 
@@ -264,12 +345,12 @@ int WritePlatformFileCurPosNoBestEffort(PlatformFile file,
 
 bool TruncatePlatformFile(PlatformFile file, int64 length) {
   base::ThreadRestrictions::AssertIOAllowed();
-  return ((file >= 0) && !HANDLE_EINTR(ftruncate(file, length)));
+  return ((file >= 0) && !CallFtruncate(file, length));
 }
 
 bool FlushPlatformFile(PlatformFile file) {
   base::ThreadRestrictions::AssertIOAllowed();
-  return !HANDLE_EINTR(fsync(file));
+  return !CallFsync(file);
 }
 
 bool TouchPlatformFile(PlatformFile file, const base::Time& last_access_time,
@@ -282,20 +363,7 @@ bool TouchPlatformFile(PlatformFile file, const base::Time& last_access_time,
   times[0] = last_access_time.ToTimeVal();
   times[1] = last_modified_time.ToTimeVal();
 
-#ifdef __USE_XOPEN2K8
-  // futimens should be available, but futimes might not be
-  // http://pubs.opengroup.org/onlinepubs/9699919799/
-
-  timespec ts_times[2];
-  ts_times[0].tv_sec  = times[0].tv_sec;
-  ts_times[0].tv_nsec = times[0].tv_usec * 1000;
-  ts_times[1].tv_sec  = times[1].tv_sec;
-  ts_times[1].tv_nsec = times[1].tv_usec * 1000;
-
-  return !futimens(file, ts_times);
-#else
-  return !futimes(file, times);
-#endif
+  return !CallFutimes(file, times);
 }
 
 bool GetPlatformFileInfo(PlatformFile file, PlatformFileInfo* info) {
@@ -322,8 +390,10 @@ PlatformFileError ErrnoToPlatformFileError(int saved_errno) {
     case EROFS:
     case EPERM:
       return PLATFORM_FILE_ERROR_ACCESS_DENIED;
+#if !defined(OS_NACL)  // ETXTBSY not defined by NaCl.
     case ETXTBSY:
       return PLATFORM_FILE_ERROR_IN_USE;
+#endif
     case EEXIST:
       return PLATFORM_FILE_ERROR_EXISTS;
     case ENOENT: