Merge 175642 (also includes 175980)

base/platform_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/platform_file.h"
 
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ skipping 23 matching lines @@
 }
 #else
 typedef struct stat64 stat_wrapper_t;
 static int CallFstat(int fd, stat_wrapper_t *sb) {
   base::ThreadRestrictions::AssertIOAllowed();
   return fstat64(fd, sb);
 }
 #endif
 
 // TODO(erikkay): does it make sense to support PLATFORM_FILE_EXCLUSIVE_* here?
-PlatformFile CreatePlatformFile(const FilePath& name, int flags,
-                                bool* created, PlatformFileError* error_code) {
+PlatformFile CreatePlatformFileUnsafe(const FilePath& name,
+                                      int flags,
+                                      bool* created,
+                                      PlatformFileError* error) {
   base::ThreadRestrictions::AssertIOAllowed();
 
   int open_flags = 0;
   if (flags & PLATFORM_FILE_CREATE)
     open_flags = O_CREAT | O_EXCL;
 
   if (created)
     *created = false;
 
   if (flags & PLATFORM_FILE_CREATE_ALWAYS) {
     DCHECK(!open_flags);
     open_flags = O_CREAT | O_TRUNC;
   }
 
   if (flags & PLATFORM_FILE_OPEN_TRUNCATED) {
     DCHECK(!open_flags);
     DCHECK(flags & PLATFORM_FILE_WRITE);
     open_flags = O_TRUNC;
   }
 
   if (!open_flags && !(flags & PLATFORM_FILE_OPEN) &&
       !(flags & PLATFORM_FILE_OPEN_ALWAYS)) {
     NOTREACHED();
     errno = EOPNOTSUPP;
-    if (error_code)
-      *error_code = PLATFORM_FILE_ERROR_FAILED;
+    if (error)
+      *error = PLATFORM_FILE_ERROR_FAILED;
     return kInvalidPlatformFileValue;
   }
 
   if (flags & PLATFORM_FILE_WRITE && flags & PLATFORM_FILE_READ) {
     open_flags |= O_RDWR;
   } else if (flags & PLATFORM_FILE_WRITE) {
     open_flags |= O_WRONLY;
   } else if (!(flags & PLATFORM_FILE_READ) &&
              !(flags & PLATFORM_FILE_WRITE_ATTRIBUTES) &&
              !(flags & PLATFORM_FILE_OPEN_ALWAYS)) {
@@ skipping 28 matching lines @@
   }
 
   if (created && (descriptor >= 0) &&
       (flags & (PLATFORM_FILE_CREATE_ALWAYS | PLATFORM_FILE_CREATE)))
     *created = true;
 
   if ((descriptor >= 0) && (flags & PLATFORM_FILE_DELETE_ON_CLOSE)) {
     unlink(name.value().c_str());
   }
 
-  if (error_code) {
+  if (error) {
     if (descriptor >= 0)
-      *error_code = PLATFORM_FILE_OK;
+      *error = PLATFORM_FILE_OK;
     else {
       switch (errno) {
         case EACCES:
         case EISDIR:
         case EROFS:
         case EPERM:
-          *error_code = PLATFORM_FILE_ERROR_ACCESS_DENIED;
+          *error = PLATFORM_FILE_ERROR_ACCESS_DENIED;
           break;
         case ETXTBSY:
-          *error_code = PLATFORM_FILE_ERROR_IN_USE;
+          *error = PLATFORM_FILE_ERROR_IN_USE;
           break;
         case EEXIST:
-          *error_code = PLATFORM_FILE_ERROR_EXISTS;
+          *error = PLATFORM_FILE_ERROR_EXISTS;
           break;
         case ENOENT:
-          *error_code = PLATFORM_FILE_ERROR_NOT_FOUND;
+          *error = PLATFORM_FILE_ERROR_NOT_FOUND;
           break;
         case EMFILE:
-          *error_code = PLATFORM_FILE_ERROR_TOO_MANY_OPENED;
+          *error = PLATFORM_FILE_ERROR_TOO_MANY_OPENED;
           break;
         case ENOMEM:
-          *error_code = PLATFORM_FILE_ERROR_NO_MEMORY;
+          *error = PLATFORM_FILE_ERROR_NO_MEMORY;
           break;
         case ENOSPC:
-          *error_code = PLATFORM_FILE_ERROR_NO_SPACE;
+          *error = PLATFORM_FILE_ERROR_NO_SPACE;
           break;
         case ENOTDIR:
-          *error_code = PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
+          *error = PLATFORM_FILE_ERROR_NOT_A_DIRECTORY;
           break;
         default:
-          *error_code = PLATFORM_FILE_ERROR_FAILED;
+          *error = PLATFORM_FILE_ERROR_FAILED;
       }
     }
   }
 
   return descriptor;
 }
 
 bool ClosePlatformFile(PlatformFile file) {
   base::ThreadRestrictions::AssertIOAllowed();
   return !HANDLE_EINTR(close(file));
@@ skipping 145 matching lines @@
   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;
   info->last_modified = base::Time::FromTimeT(file_info.st_mtime);
   info->last_accessed = base::Time::FromTimeT(file_info.st_atime);
   info->creation_time = base::Time::FromTimeT(file_info.st_ctime);
   return true;
 }
 
 }  // namespace base