Fix chrome upload with content uri

base/file_util_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/file_util.h"
 
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <libgen.h>
@@ skipping 30 matching lines @@
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 
 #if defined(OS_ANDROID)
+#include "base/android/content_uri_utils.h"
 #include "base/os_compat_android.h"
 #endif
 
 #if !defined(OS_IOS)
 #include <grp.h>
 #endif
 
 namespace base {
 
 namespace {
@@ skipping 11 matching lines @@
 #else
 typedef struct stat64 stat_wrapper_t;
 static int CallStat(const char *path, stat_wrapper_t *sb) {
   ThreadRestrictions::AssertIOAllowed();
   return stat64(path, sb);
 }
 static int CallLstat(const char *path, stat_wrapper_t *sb) {
   ThreadRestrictions::AssertIOAllowed();
   return lstat64(path, sb);
 }
+#if defined(OS_ANDROID)
+static int CallFstat(int fd, stat_wrapper_t *sb) {
+  ThreadRestrictions::AssertIOAllowed();
+  return fstat64(fd, sb);
+}
+#endif
 #endif
 
 // Helper for NormalizeFilePath(), defined below.
 bool RealPath(const FilePath& path, FilePath* real_path) {
   ThreadRestrictions::AssertIOAllowed();  // For realpath().
   FilePath::CharType buf[PATH_MAX];
   if (!realpath(path.value().c_str(), buf))
     return false;
 
   *real_path = FilePath(buf);
@@ skipping 209 matching lines @@
     current = traversal.Next();
     if (!current.empty())
       from_stat = traversal.GetInfo().stat();
   }
 
   return success;
 }
 
 bool PathExists(const FilePath& path) {
   ThreadRestrictions::AssertIOAllowed();
+#if defined(OS_ANDROID)
+  if (path.IsContentUrl()) {
+    return ContentUrlExists(path);
+  }

[kinuko, 2013/11/06 01:42:05]

nit: usually we use no { } for single-line block in chromium

[qinmin, 2013/11/07 01:13:35]

Done.

+#endif
   return access(path.value().c_str(), F_OK) == 0;
 }
 
 bool PathIsWritable(const FilePath& path) {
   ThreadRestrictions::AssertIOAllowed();
   return access(path.value().c_str(), W_OK) == 0;
 }
 
 bool DirectoryExists(const FilePath& path) {
   ThreadRestrictions::AssertIOAllowed();
@@ skipping 241 matching lines @@
     return false;
 
   if (S_ISLNK(st.st_mode))
     return true;
   else
     return false;
 }
 
 bool GetFileInfo(const FilePath& file_path, base::PlatformFileInfo* results) {
   stat_wrapper_t file_info;
+#if defined(OS_ANDROID)
+  if (file_path.IsContentUrl()) {
+    int fd = OpenContentUrlForRead(file_path);
+    if (fd < 0)
+      return false;
+    ScopedFD scoped_fd(&fd);
+    if (base::CallFstat(fd, &file_info) != 0)
+      return false;
+  } else {
+#endif
   if (CallStat(file_path.value().c_str(), &file_info) != 0)

[joth, 2013/11/06 00:27:08]

It looks like CallStat() is already intended to have different implementation
per-platform up top of file.
Can't we push the ifdef logic into that?

[qinmin, 2013/11/07 01:13:35]

I think I would rather keep it separate. CallStat() will set errno, so we have
to do the same when fd < 0 and it looks ugly. If other platforms later decided
to add Fstat(), they can just reuse the FStat() function we added. Having
something like file_path.IsContentUrl() inside CallStat() makes it not reusable.

On 2013/11/06 00:27:08, joth wrote:

     return false;
+#if defined(OS_ANDROID)
+  }
+#endif
   results->is_directory = S_ISDIR(file_info.st_mode);
   results->size = file_info.st_size;
 #if defined(OS_MACOSX)
   results->last_modified = base::Time::FromTimeSpec(file_info.st_mtimespec);
   results->last_accessed = base::Time::FromTimeSpec(file_info.st_atimespec);
   results->creation_time = base::Time::FromTimeSpec(file_info.st_ctimespec);
 #elif defined(OS_ANDROID)
   results->last_modified = base::Time::FromTimeT(file_info.st_mtime);
   results->last_accessed = base::Time::FromTimeT(file_info.st_atime);
   results->creation_time = base::Time::FromTimeT(file_info.st_ctime);
@@ skipping 362 matching lines @@
     result = false;
   if (HANDLE_EINTR(close(outfile)) < 0)
     result = false;
 
   return result;
 }
 #endif  // !defined(OS_MACOSX)
 
 }  // namespace internal
 }  // namespace base