proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-08-14 00:35:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

apple: work around non-POSIX struct stat on OS X.

Browse Source
This commit is contained in:
Axel Rasmussen 2015-09-18 23:48:22 -07:00
parent 0226f7dd36
commit 28cdb3153c
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/fileops.c
View File

@ -1027,6 +1027,11 @@ int git_futils_filestamp_check(
git_futils_filestamp *stamp, const char *path) git_futils_filestamp *stamp, const char *path)
{ {
struct stat st; 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 the stamp is NULL, then always reload */
if (stamp == NULL) if (stamp == NULL)
@ -1035,17 +1040,17 @@ int git_futils_filestamp_check(
if (p_stat(path, &st) < 0) if (p_stat(path, &st) < 0)
return GIT_ENOTFOUND; 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) #if defined(GIT_USE_NSEC)
stamp->mtime.tv_nsec == st.st_mtim.tv_nsec && stamp->mtime.tv_nsec == statmtime->tv_nsec &&
#endif #endif
stamp->size == (git_off_t)st.st_size && stamp->size == (git_off_t)st.st_size &&
stamp->ino == (unsigned int)st.st_ino) stamp->ino == (unsigned int)st.st_ino)
return 0; return 0;
stamp->mtime.tv_sec = st.st_mtim.tv_sec; stamp->mtime.tv_sec = statmtime->tv_sec;
#if defined(GIT_USE_NSEC) #if defined(GIT_USE_NSEC)
stamp->mtime.tv_nsec = st.st_mtim.tv_nsec; stamp->mtime.tv_nsec = statmtime->tv_nsec;
#endif #endif
stamp->size = (git_off_t)st.st_size; stamp->size = (git_off_t)st.st_size;
stamp->ino = (unsigned int)st.st_ino; stamp->ino = (unsigned int)st.st_ino;
@ -1068,8 +1073,14 @@ void git_futils_filestamp_set(
void git_futils_filestamp_set_from_stat( void git_futils_filestamp_set_from_stat(
git_futils_filestamp *stamp, struct stat *st) 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) { if (st) {
stamp->mtime = st->st_mtim; stamp->mtime = *statmtime;
stamp->size = (git_off_t)st->st_size; stamp->size = (git_off_t)st->st_size;
stamp->ino = (unsigned int)st->st_ino; stamp->ino = (unsigned int)st->st_ino;
} else { } else {