Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libroot_build: Explicitly support FreeBSD struct stat anomalies

Browse Source 
Use stat::st_{a,m}timespec on FreeBSD instead of the POSIXish
stat::st_{a,m}tim. Fixes part of the FreeBSD build issues recently
introduced.
This commit is contained in:
Ingo Weinhold 2011-11-28 01:52:17 +01:00
parent 9f66f05b58
commit b328f5b034
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/build/libroot/fs.cpp
View File

@ -43,11 +43,15 @@ using namespace BPrivate;
# define haiku_host_platform_write haiku_freebsd_write # define haiku_host_platform_write haiku_freebsd_write
# define haiku_host_platform_readv haiku_freebsd_readv # define haiku_host_platform_readv haiku_freebsd_readv
# define haiku_host_platform_writev haiku_freebsd_writev # define haiku_host_platform_writev haiku_freebsd_writev
# define HAIKU_HOST_STAT_ATIM(x) ((x).st_atimespec)
# define HAIKU_HOST_STAT_MTIM(x) ((x).st_mtimespec)
#else #else
# define haiku_host_platform_read read # define haiku_host_platform_read read
# define haiku_host_platform_write write # define haiku_host_platform_write write
# define haiku_host_platform_readv readv # define haiku_host_platform_readv readv
# define haiku_host_platform_writev writev # define haiku_host_platform_writev writev
# define HAIKU_HOST_STAT_ATIM(x) ((x).st_atim)
# define HAIKU_HOST_STAT_MTIM(x) ((x).st_mtim)
#endif #endif
#define RETURN_AND_SET_ERRNO(err) \ #define RETURN_AND_SET_ERRNO(err) \
@ -1125,8 +1129,10 @@ _haiku_build_utimensat(int fd, const char* path, const struct timespec times[2],
|| times[1].tv_nsec == UTIME_NOW) { || times[1].tv_nsec == UTIME_NOW) {
timeval now; timeval now;
gettimeofday(&now, NULL); gettimeofday(&now, NULL);
stat.st_atim.tv_sec = stat.st_mtim.tv_sec = now.tv_sec; HAIKU_HOST_STAT_ATIM(stat).tv_sec
stat.st_atim.tv_nsec = stat.st_mtim.tv_nsec = now.tv_usec * 1000; = HAIKU_HOST_STAT_MTIM(stat).tv_sec = now.tv_sec;
HAIKU_HOST_STAT_ATIM(stat).tv_nsec
= HAIKU_HOST_STAT_MTIM(stat).tv_nsec = now.tv_usec * 1000;
} }
if (times != NULL) { if (times != NULL) {
@ -1139,7 +1145,7 @@ _haiku_build_utimensat(int fd, const char* path, const struct timespec times[2],
RETURN_AND_SET_ERRNO(EINVAL); RETURN_AND_SET_ERRNO(EINVAL);
} }
stat.st_atim = times[0]; HAIKU_HOST_STAT_ATIM(stat) = times[0];
} }
// modified time // modified time
@ -1151,7 +1157,7 @@ _haiku_build_utimensat(int fd, const char* path, const struct timespec times[2],
RETURN_AND_SET_ERRNO(EINVAL); RETURN_AND_SET_ERRNO(EINVAL);
} }
stat.st_mtim = times[1]; HAIKU_HOST_STAT_MTIM(stat) = times[1];
} }
} else } else
mask |= B_STAT_ACCESS_TIME | B_STAT_MODIFICATION_TIME; mask |= B_STAT_ACCESS_TIME | B_STAT_MODIFICATION_TIME;