Commit 7a612b53cfcd9325178597882cddada412432b18
2015-11-20T17:52:00
Merge pull request #3514 from jacquesg/stat-fixes Stat fixes
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0537b19..0b7a03c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,9 +86,20 @@ IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
OPTION( USE_OPENSSL "Link with and use openssl library" ON )
ENDIF()
-CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtim.tv_nsec sys/stat.h
- HAVE_STRUCT_STAT_NSEC LANGUAGE C)
-IF(HAVE_STRUCT_STAT_NSEC OR WIN32)
+CHECK_STRUCT_HAS_MEMBER ("struct stat" st_atim "sys/types.h;sys/stat.h"
+ HAVE_STRUCT_STAT_ST_ATIM LANGUAGE C)
+CHECK_STRUCT_HAS_MEMBER ("struct stat" st_atimespec "sys/types.h;sys/stat.h"
+ HAVE_STRUCT_STAT_ST_ATIMESPEC LANGUAGE C)
+
+IF (HAVE_STRUCT_STAT_ST_ATIM)
+ CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtim.tv_nsec sys/stat.h
+ HAVE_STRUCT_STAT_NSEC LANGUAGE C)
+ELSEIF (HAVE_STRUCT_STAT_ST_ATIMESPEC)
+ CHECK_STRUCT_HAS_MEMBER("struct stat" st_mtimespec.tv_nsec sys/stat.h
+ HAVE_STRUCT_STAT_NSEC LANGUAGE C)
+ENDIF()
+
+IF (HAVE_STRUCT_STAT_NSEC OR WIN32)
OPTION( USE_NSEC "Care about sub-second file mtimes and ctimes" OFF )
ENDIF()
@@ -527,6 +538,10 @@ IF (USE_NSEC)
ADD_DEFINITIONS(-DGIT_USE_NSEC)
ENDIF()
+IF (HAVE_STRUCT_STAT_ST_ATIMESPEC)
+ ADD_DEFINITIONS(-DGIT_USE_STAT_ATIMESPEC)
+ENDIF()
+
ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
# Collect sourcefiles
diff --git a/src/fileops.c b/src/fileops.c
index 07eb504..6aafd06 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -13,6 +13,12 @@
#include "win32/findfile.h"
#endif
+#ifdef GIT_USE_STAT_ATIMESPEC
+#define st_atim st_atimespec
+#define st_ctim st_ctimespec
+#define st_mtim st_mtimespec
+#endif
+
GIT__USE_STRMAP
int git_futils_mkpath2file(const char *file_path, const mode_t mode)
@@ -1034,11 +1040,7 @@ int git_futils_filestamp_check(
git_futils_filestamp *stamp, const char *path)
{
struct stat st;
-#if defined(__APPLE__)
- const struct timespec *statmtime = &st.st_mtimespec;
-#else
const struct timespec *statmtime = &st.st_mtim;
-#endif
/* if the stamp is NULL, then always reload */
if (stamp == NULL)
@@ -1080,11 +1082,7 @@ void git_futils_filestamp_set(
void git_futils_filestamp_set_from_stat(
git_futils_filestamp *stamp, struct stat *st)
{
-#if defined(__APPLE__)
- const struct timespec *statmtime = &st->st_mtimespec;
-#else
const struct timespec *statmtime = &st->st_mtim;
-#endif
if (st) {
stamp->mtime = *statmtime;