commit 527ea31e26f1343f15d8df0d475a98bb62084d73
author rvargas@chromium.org <rvargas@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Sat Apr 05 11:39:18 2014 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 16:25:15 2020 +0900
tree 3a4cd9e162c335a053f20ade9df53f199cae2afc
parent 4dfec4a74355ef2ac56509ced7f0c19dc8a260f2

Base: Make file_util and file use the same code to translate from stat to File::Info

BUG=353318

Review URL: https://codereview.chromium.org/203873002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261956 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: f745d724808728fe36d6475556f1a54ba15520dc

base/file_util_posix.cc

diff --git a/base/file_util_posix.cc b/base/file_util_posix.cc
index 03afea7..e2eb2f8 100644
--- a/base/file_util_posix.cc
+++ b/base/file_util_posix.cc
@@ -61,8 +61,7 @@
 
 namespace {
 
-#if defined(OS_BSD) || defined(OS_MACOSX)
-typedef struct stat stat_wrapper_t;
+#if defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
 static int CallStat(const char *path, stat_wrapper_t *sb) {
   ThreadRestrictions::AssertIOAllowed();
   return stat(path, sb);
@@ -71,8 +70,7 @@
   ThreadRestrictions::AssertIOAllowed();
   return lstat(path, sb);
 }
-#else  // defined(OS_BSD) || defined(OS_MACOSX)
-typedef struct stat64 stat_wrapper_t;
+#else  //  defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL)
 static int CallStat(const char *path, stat_wrapper_t *sb) {
   ThreadRestrictions::AssertIOAllowed();
   return stat64(path, sb);
@@ -81,7 +79,7 @@
   ThreadRestrictions::AssertIOAllowed();
   return lstat64(path, sb);
 }
-#endif // !(defined(OS_BSD) || defined(OS_MACOSX))
+#endif // !(defined(OS_BSD) || defined(OS_MACOSX) || defined(OS_NACL))
 
 // Helper for NormalizeFilePath(), defined below.
 bool RealPath(const FilePath& path, FilePath* real_path) {
@@ -639,21 +637,8 @@
 #if defined(OS_ANDROID)
   }
 #endif  // defined(OS_ANDROID)
-  results->is_directory = S_ISDIR(file_info.st_mode);
-  results->size = file_info.st_size;
-#if defined(OS_MACOSX) || (defined(OS_FREEBSD) && __FreeBSD_version < 900000)
-  results->last_modified = Time::FromTimeSpec(file_info.st_mtimespec);
-  results->last_accessed = Time::FromTimeSpec(file_info.st_atimespec);
-  results->creation_time = Time::FromTimeSpec(file_info.st_ctimespec);
-#elif defined(OS_ANDROID)
-  results->last_modified = Time::FromTimeT(file_info.st_mtime);
-  results->last_accessed = Time::FromTimeT(file_info.st_atime);
-  results->creation_time = Time::FromTimeT(file_info.st_ctime);
-#else
-  results->last_modified = Time::FromTimeSpec(file_info.st_mtim);
-  results->last_accessed = Time::FromTimeSpec(file_info.st_atim);
-  results->creation_time = Time::FromTimeSpec(file_info.st_ctim);
-#endif
+
+  results->FromStat(file_info);
   return true;
 }