From 24d22be31cbb1325553db5cf58c714067c8f65cc Mon Sep 17 00:00:00 2001 From: Kan-Ru Chen Date: Mon, 5 Jul 2010 17:04:37 +0800 Subject: acp: Ensure dst mtime always greater or equal to src mtime When copying files from file systems that support high resolution mtime, we should not truncating the nsec part. Instead we should increase the dst mtime by one sec to prevent dst mtime to become less than src mtime. Change-Id: I2b4200c72c4e6ee8aae875b5e64701324799afc7 --- libs/host/CopyFile.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'libs') diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c index a822b41..98adcff 100644 --- a/libs/host/CopyFile.c +++ b/libs/host/CopyFile.c @@ -63,6 +63,22 @@ static bool isSourceNewer(const struct stat* pSrcStat, const struct stat* pDstSt } /* + * Returns true if the source file has high resolution modification + * date. Cygwin doesn't support st_mtim in normal build, so always + * return false. + */ +static bool isHiresMtime(const struct stat* pSrcStat) +{ +#ifdef WIN32_EXE + return 0; +#elif defined(MACOSX_RSRC) + return pSrcStat->st_mtimespec.tv_nsec > 0; +#else + return pSrcStat->st_mtim.tv_nsec > 0; +#endif +} + +/* * Returns true if the source and destination files are actually the * same thing. We detect this by checking the inode numbers, which seems * to work on Cygwin. @@ -151,6 +167,8 @@ static int setPermissions(const char* dst, const struct stat* pSrcStat, unsigned */ ut.actime = pSrcStat->st_atime; ut.modtime = pSrcStat->st_mtime; + if (isHiresMtime(pSrcStat)) + ut.modtime += 1; if (utime(dst, &ut) != 0) { DBUG(("--- unable to set timestamps on '%s': %s\n", dst, strerror(errno))); -- cgit v1.1