commit 7d4ae91e0bba6553673b5ab439e639ca0c8d3221
author Jean-Baptiste Queru <jbq@google.com> Thu Jul 08 09:47:08 2010 -0700
committer Android Code Review <code-review@android.com> Thu Jul 08 09:47:08 2010 -0700
tree 8352030848d62b51256b7c1dcdb0fd1ede7ebf93
parent 4e3c6686d15423a41a419b78143852eebfc2eb46
parent a67bc11058f47eeba1f8bb30173c73ec0af8fcce

Merge "acp: Ensure dst mtime always greater or equal to src mtime"

libs/host/CopyFile.c

diff --git a/libs/host/CopyFile.c b/libs/host/CopyFile.c
index a822b41..8cdf07a 100644
--- a/libs/host/CopyFile.c
+++ b/libs/host/CopyFile.c
@@ -151,6 +151,12 @@
          */
         ut.actime = pSrcStat->st_atime;
         ut.modtime = pSrcStat->st_mtime;
+#ifdef MACOSX_RSRC
+        if (pSrcStat->st_mtimespec.tv_nsec > 0)
+#else
+        if (pSrcStat->st_mtim.tv_nsec > 0)
+#endif
+            ut.modtime += 1;
         if (utime(dst, &ut) != 0) {
             DBUG(("---   unable to set timestamps on '%s': %s\n",
                 dst, strerror(errno)));