diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-11-21 01:52:00 +0300 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2015-11-21 01:52:00 +0300 |
| commit | 7a612b53cfcd9325178597882cddada412432b18 (patch) | |
| tree | c77e12fa66d0e4993ba784271e7fb633f9a7d866 | |
| parent | 1f6c891e9517a1b82caf4be6e58b025c8f575cc3 (diff) | |
| parent | eb11fac629aa6acee934fc310621ed9a50a200fa (diff) | |
Merge pull request #3514 from jacquesg/stat-fixes
Stat fixes
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/fileops.c | 14 |
2 files changed, 24 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0537b19d1..0b7a03c67 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 07eb504bd..6aafd06b6 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; |