Switch [String]FileWriter to use new file_io.h functions/types

util/file/file_writer.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "util/file/file_writer.h"
 
 #include <algorithm>
 
 #include <limits.h>
 
 #include "base/logging.h"
 #include "base/posix/eintr_wrapper.h"
-#include "util/file/file_io.h"
 
 namespace crashpad {
 
+#if defined(OS_POSIX)
 // Ensure type compatibility between WritableIoVec and iovec.
 static_assert(sizeof(WritableIoVec) == sizeof(iovec), "WritableIoVec size");
 static_assert(offsetof(WritableIoVec, iov_base) == offsetof(iovec, iov_base),
               "WritableIoVec base offset");
 static_assert(offsetof(WritableIoVec, iov_len) == offsetof(iovec, iov_len),
               "WritableIoVec len offset");
+#endif  // OS_POSIX
 
-FileWriter::FileWriter() : fd_() {
+FileWriter::FileWriter() : file_() {
 }
 
 FileWriter::~FileWriter() {
 }
 
-bool FileWriter::Open(const base::FilePath& path, int oflag, mode_t mode) {
-  CHECK(!fd_.is_valid());
-
-  DCHECK((oflag & O_WRONLY) || (oflag & O_RDWR));
-
-  fd_.reset(HANDLE_EINTR(open(path.value().c_str(), oflag, mode)));
-  if (!fd_.is_valid()) {
-    PLOG(ERROR) << "open " << path.value();
-    return false;
-  }
-
-  return true;
+bool FileWriter::Open(const base::FilePath& path,
+                      FileWriteMode write_mode,
+                      bool world_readable) {
+  CHECK(!file_.is_valid());
+  file_.reset(LoggingOpenFileForWrite(path, write_mode, world_readable));
+  return file_.is_valid();
 }
 
 void FileWriter::Close() {
-  CHECK(fd_.is_valid());
+  CHECK(file_.is_valid());
 
-  fd_.reset();
+  file_.reset();
 }
 
 bool FileWriter::Write(const void* data, size_t size) {
-  DCHECK(fd_.is_valid());
+  DCHECK(file_.is_valid());
 
   // TODO(mark): Write no more than SSIZE_MAX bytes in a single call.
-  ssize_t written = WriteFile(fd_.get(), data, size);
+  ssize_t written = WriteFile(file_.get(), data, size);
   if (written < 0) {
     PLOG(ERROR) << "write";
     return false;
   } else if (written == 0) {
     LOG(ERROR) << "write: returned 0";
     return false;
   }
 
   return true;
 }
 
+#if defined(OS_POSIX)
+
 bool FileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
-  DCHECK(fd_.is_valid());
+  DCHECK(file_.is_valid());
 
   ssize_t size = 0;
   for (const WritableIoVec& iov : *iovecs) {
     // TODO(mark): Check to avoid overflow of ssize_t, and fail with EINVAL.
     size += iov.iov_len;
   }
 
   // Get an iovec*, because that’s what writev wants. The only difference
   // between WritableIoVec and iovec is that WritableIoVec’s iov_base is a
   // pointer to a const buffer, where iovec’s iov_base isn’t. writev doesn’t
   // actually write to the data, so this cast is safe here. iovec’s iov_base is
   // non-const because the same structure is used for readv and writev, and
   // readv needs to write to the buffer that iov_base points to.
   iovec* iov = reinterpret_cast<iovec*>(&(*iovecs)[0]);
   size_t remaining_iovecs = iovecs->size();
 
   while (size > 0) {
     size_t writev_iovec_count =
         std::min(remaining_iovecs, implicit_cast<size_t>(IOV_MAX));
-    ssize_t written = HANDLE_EINTR(writev(fd_.get(), iov, writev_iovec_count));
+    ssize_t written =
+        HANDLE_EINTR(writev(file_.get(), iov, writev_iovec_count));
     if (written < 0) {
       PLOG(ERROR) << "writev";
       return false;
     } else if (written == 0) {
       LOG(ERROR) << "writev: returned 0";
       return false;
     }
 
     size -= written;
     DCHECK_GE(size, 0);
@@ skipping 13 matching lines @@
         iov->iov_len -= wrote_this_iovec;
       } else {
         ++iov;
         --remaining_iovecs;
       }
     }
   }
 
   DCHECK_EQ(remaining_iovecs, 0u);
 
 #ifndef NDEBUG

[Mark Mentovai, 2014/12/19 18:57:44]

Can you do this in the non-POSIX implementation too?

Maybe it’s easier if the #if is inside the method body.

[scottmg, 2014/12/19 19:37:53]

Done.

   // The interface says that |iovecs| is not sacred, so scramble it to make sure
   // that nobody depends on it.
   memset(&(*iovecs)[0], 0xa5, sizeof((*iovecs)[0]) * iovecs->size());
 #endif
 
   return true;
 }
 
-off_t FileWriter::Seek(off_t offset, int whence) {
-  DCHECK(fd_.is_valid());
+#else
 
-  off_t rv = lseek(fd_.get(), offset, whence);
-  if (rv < 0) {
-    PLOG(ERROR) << "lseek";
+bool FileWriter::WriteIoVec(std::vector<WritableIoVec>* iovecs) {
+  for (const WritableIoVec& iov : *iovecs) {
+    if (!Write(iov.iov_base, iov.iov_len))
+      return false;
   }
+  return true;
+}
 
-  return rv;
+#endif  // OS_POSIX
+
+FileOffset FileWriter::Seek(FileOffset offset, int whence) {
+  DCHECK(file_.is_valid());
+  return LoggingSeekFile(file_.get(), offset, whence);
 }
 
 }  // namespace crashpad