Commit 28cdb3153c8c6d651c5b2afcf315a2d188e9fde9
2015-09-18T23:48:22
apple: work around non-POSIX struct stat on OS X.
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
diff --git a/src/fileops.c b/src/fileops.c
index da1d8a0..5b54298 100644
--- a/src/fileops.c
+++ b/src/fileops.c
@@ -359,7 +359,7 @@ GIT_INLINE(int) mkdir_validate_mode(
return 0;
}
-
+
GIT_INLINE(int) mkdir_canonicalize(
git_buf *path,
uint32_t flags)
@@ -1027,6 +1027,11 @@ 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)
@@ -1035,17 +1040,17 @@ int git_futils_filestamp_check(
if (p_stat(path, &st) < 0)
return GIT_ENOTFOUND;
- if (stamp->mtime.tv_sec == st.st_mtim.tv_sec &&
+ if (stamp->mtime.tv_sec == statmtime->tv_sec &&
#if defined(GIT_USE_NSEC)
- stamp->mtime.tv_nsec == st.st_mtim.tv_nsec &&
+ stamp->mtime.tv_nsec == statmtime->tv_nsec &&
#endif
stamp->size == (git_off_t)st.st_size &&
stamp->ino == (unsigned int)st.st_ino)
return 0;
- stamp->mtime.tv_sec = st.st_mtim.tv_sec;
+ stamp->mtime.tv_sec = statmtime->tv_sec;
#if defined(GIT_USE_NSEC)
- stamp->mtime.tv_nsec = st.st_mtim.tv_nsec;
+ stamp->mtime.tv_nsec = statmtime->tv_nsec;
#endif
stamp->size = (git_off_t)st.st_size;
stamp->ino = (unsigned int)st.st_ino;
@@ -1068,8 +1073,14 @@ 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 = st->st_mtim;
+ stamp->mtime = *statmtime;
stamp->size = (git_off_t)st->st_size;
stamp->ino = (unsigned int)st->st_ino;
} else {