drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bionic's struct stat is now POSIX-compliant."

Browse Source
This commit is contained in:
Elliott Hughes
2014-11-10 18:55:30 +00:00
committed by Gerrit Code Review
parent 5cce4c752e 4da9dc5a62
commit c34e63598e
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libs/androidfw/BackupHelpers.cpp
View File

@ -1307,23 +1307,12 @@ get_mod_time(const char* filename, struct timeval times[2])
fprintf(stderr, "stat '%s' failed: %s\n", filename, strerror(errno)); fprintf(stderr, "stat '%s' failed: %s\n", filename, strerror(errno));
return errno; return errno;
} }
times[0].tv_sec = st.st_atime;
times[1].tv_sec = st.st_mtime;
// If st_atime is a macro then struct stat64 uses struct timespec times[0].tv_sec = st.st_atim.tv_sec;
// to store the access and modif time values and typically
// st_*time_nsec is not defined. In glibc, this is controlled by
// __USE_MISC.
#ifdef __USE_MISC
#if !defined(st_atime) || defined(st_atime_nsec)
#error "Check if this __USE_MISC conditional is still needed."
#endif
times[0].tv_usec = st.st_atim.tv_nsec / 1000; times[0].tv_usec = st.st_atim.tv_nsec / 1000;
times[1].tv_sec = st.st_mtim.tv_sec;
times[1].tv_usec = st.st_mtim.tv_nsec / 1000; times[1].tv_usec = st.st_mtim.tv_nsec / 1000;
#else
times[0].tv_usec = st.st_atime_nsec / 1000;
times[1].tv_usec = st.st_mtime_nsec / 1000;
#endif
return 0; return 0;
} }