Revert 257577 "Revert 257562 "Base: Make base::File use ScopedFD..."

trunk/src/base/files/file_posix.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ skipping 184 matching lines @@
     created_ = true;
 
   if ((descriptor >= 0) && (flags & FLAG_DELETE_ON_CLOSE))
     unlink(name.value().c_str());
 
   if (descriptor >= 0)
     error_details_ = FILE_OK;
   else
     error_details_ = File::OSErrorToFileError(errno);
 
-  file_ = descriptor;
+  file_.reset(descriptor);
 }
 #endif  // !defined(OS_NACL)
 
 bool File::IsValid() const {
-  return file_ >= 0;
+  return file_.is_valid();
+}
+
+PlatformFile File::GetPlatformFile() const {
+  return file_.get();
 }
 
 PlatformFile File::TakePlatformFile() {
-  PlatformFile file = file_;
-  file_ = kInvalidPlatformFileValue;
-  return file;
+  return file_.release();
 }
 
 void File::Close() {
   if (!IsValid())
     return;
 
   base::ThreadRestrictions::AssertIOAllowed();
-  if (!IGNORE_EINTR(close(file_)))
-    file_ = kInvalidPlatformFileValue;
+  file_.reset();
 }
 
 int64 File::Seek(Whence whence, int64 offset) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
-  if (file_ < 0 || offset < 0)
+  if (offset < 0)
     return -1;
 
-  return lseek(file_, static_cast<off_t>(offset), static_cast<int>(whence));
+  return lseek(file_.get(), static_cast<off_t>(offset),
+               static_cast<int>(whence));
 }
 
 int File::Read(int64 offset, char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
   if (size < 0)
     return -1;
 
   int bytes_read = 0;
   int rv;
   do {
-    rv = HANDLE_EINTR(pread(file_, data + bytes_read,
+    rv = HANDLE_EINTR(pread(file_.get(), data + bytes_read,
                             size - bytes_read, offset + bytes_read));
     if (rv <= 0)
       break;
 
     bytes_read += rv;
   } while (bytes_read < size);
 
   return bytes_read ? bytes_read : rv;
 }
 
 int File::ReadAtCurrentPos(char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
   if (size < 0)
     return -1;
 
   int bytes_read = 0;
   int rv;
   do {
-    rv = HANDLE_EINTR(read(file_, data, size));
+    rv = HANDLE_EINTR(read(file_.get(), data, size));
     if (rv <= 0)
       break;
 
     bytes_read += rv;
   } while (bytes_read < size);
 
   return bytes_read ? bytes_read : rv;
 }
 
 int File::ReadNoBestEffort(int64 offset, char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
 
-  return HANDLE_EINTR(pread(file_, data, size, offset));
+  return HANDLE_EINTR(pread(file_.get(), data, size, offset));
 }
 
 int File::ReadAtCurrentPosNoBestEffort(char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
   if (size < 0)
     return -1;
 
-  return HANDLE_EINTR(read(file_, data, size));
+  return HANDLE_EINTR(read(file_.get(), data, size));
 }
 
 int File::Write(int64 offset, const char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
 
-  if (IsOpenAppend(file_))
+  if (IsOpenAppend(file_.get()))
     return WriteAtCurrentPos(data, size);
 
   DCHECK(IsValid());
   if (size < 0)
     return -1;
 
   int bytes_written = 0;
   int rv;
   do {
-    rv = HANDLE_EINTR(pwrite(file_, data + bytes_written,
+    rv = HANDLE_EINTR(pwrite(file_.get(), data + bytes_written,
                              size - bytes_written, offset + bytes_written));
     if (rv <= 0)
       break;
 
     bytes_written += rv;
   } while (bytes_written < size);
 
   return bytes_written ? bytes_written : rv;
 }
 
 int File::WriteAtCurrentPos(const char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
   if (size < 0)
     return -1;
 
   int bytes_written = 0;
   int rv;
   do {
-    rv = HANDLE_EINTR(write(file_, data, size));
+    rv = HANDLE_EINTR(write(file_.get(), data, size));
     if (rv <= 0)
       break;
 
     bytes_written += rv;
   } while (bytes_written < size);
 
   return bytes_written ? bytes_written : rv;
 }
 
 int File::WriteAtCurrentPosNoBestEffort(const char* data, int size) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
   if (size < 0)
     return -1;
 
-  return HANDLE_EINTR(write(file_, data, size));
+  return HANDLE_EINTR(write(file_.get(), data, size));
 }
 
 int64 File::GetLength() {
   DCHECK(IsValid());
 
   stat_wrapper_t file_info;
-  if (CallFstat(file_, &file_info))
+  if (CallFstat(file_.get(), &file_info))
     return false;
 
   return file_info.st_size;
 }
 
 bool File::SetLength(int64 length) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
-  return !CallFtruncate(file_, length);
+  return !CallFtruncate(file_.get(), length);
 }
 
 bool File::Flush() {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
-  return !CallFsync(file_);
+  return !CallFsync(file_.get());
 }
 
 bool File::SetTimes(Time last_access_time, Time last_modified_time) {
   base::ThreadRestrictions::AssertIOAllowed();
   DCHECK(IsValid());
 
   timeval times[2];
   times[0] = last_access_time.ToTimeVal();
   times[1] = last_modified_time.ToTimeVal();
 
-  return !CallFutimes(file_, times);
+  return !CallFutimes(file_.get(), times);
 }
 
 bool File::GetInfo(Info* info) {
   DCHECK(IsValid());
 
   stat_wrapper_t file_info;
-  if (CallFstat(file_, &file_info))
+  if (CallFstat(file_.get(), &file_info))
     return false;
 
   info->is_directory = S_ISDIR(file_info.st_mode);
   info->is_symbolic_link = S_ISLNK(file_info.st_mode);
   info->size = file_info.st_size;
 
 #if defined(OS_LINUX)
   const time_t last_modified_sec = file_info.st_mtim.tv_sec;
   const int64 last_modified_nsec = file_info.st_mtim.tv_nsec;
   const time_t last_accessed_sec = file_info.st_atim.tv_sec;
@@ skipping 33 matching lines @@
       base::TimeDelta::FromMicroseconds(last_accessed_nsec /
                                         base::Time::kNanosecondsPerMicrosecond);
   info->creation_time =
       base::Time::FromTimeT(creation_time_sec) +
       base::TimeDelta::FromMicroseconds(creation_time_nsec /
                                         base::Time::kNanosecondsPerMicrosecond);
   return true;
 }
 
 File::Error File::Lock() {
-  return CallFctnlFlock(file_, true);
+  return CallFctnlFlock(file_.get(), true);
 }
 
 File::Error File::Unlock() {
-  return CallFctnlFlock(file_, false);
+  return CallFctnlFlock(file_.get(), false);
 }
 
 // Static.
 File::Error File::OSErrorToFileError(int saved_errno) {
   switch (saved_errno) {
     case EACCES:
     case EISDIR:
     case EROFS:
     case EPERM:
       return FILE_ERROR_ACCESS_DENIED;
@@ skipping 16 matching lines @@
     default:
 #if !defined(OS_NACL)  // NaCl build has no metrics code.
       UMA_HISTOGRAM_SPARSE_SLOWLY("PlatformFile.UnknownErrors.Posix",
                                   saved_errno);
 #endif
       return FILE_ERROR_FAILED;
   }
 }
 
 void File::SetPlatformFile(PlatformFile file) {
-  DCHECK_EQ(file_, kInvalidPlatformFileValue);
-  file_ = file;
+  DCHECK(!file_.is_valid());
+  file_.reset(file);
 }
 
 }  // namespace base