X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/7b6c5c77942b8d11631c873b008e0b405d435bc0..1b502f3ec234bf1045c6bb146f64734d09e81956:/util.c

diff --git a/util.c b/util.c
index 4d58dc41..6019fccb 100644
--- a/util.c
+++ b/util.c
@@ -123,9 +123,9 @@ NORETURN void overflow_exit(const char *str)
 	exit_cleanup(RERR_MALLOC);
 }
 
-int set_modtime(const char *fname, time_t modtime, mode_t mode)
+int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
 {
-#if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
+#ifndef CAN_SET_SYMLINK_TIMES
 	if (S_ISLNK(mode))
 		return 1;
 #endif
@@ -140,20 +140,28 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
 		return 0;
 
 	{
-#ifdef HAVE_UTIMES
+#ifdef HAVE_UTIMENSAT
+		struct timespec t[2];
+		t[0].tv_sec = 0;
+		t[0].tv_nsec = UTIME_NOW;
+		t[1].tv_sec = modtime;
+		t[1].tv_nsec = mod_nsec;
+		if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) < 0)
+			return S_ISLNK(mode) && errno == ENOSYS ? 1 : -1;
+		return 0;
+#elif defined HAVE_UTIMES || defined HAVE_LUTIMES
 		struct timeval t[2];
 		t[0].tv_sec = time(NULL);
 		t[0].tv_usec = 0;
 		t[1].tv_sec = modtime;
-		t[1].tv_usec = 0;
+		t[1].tv_usec = mod_nsec / 1000;
 # ifdef HAVE_LUTIMES
-		if (S_ISLNK(mode)) {
-			if (lutimes(fname, t) < 0)
-				return errno == ENOSYS ? 1 : -1;
-			return 0;
-		}
-# endif
+		if (lutimes(fname, t) < 0)
+			return S_ISLNK(mode) && errno == ENOSYS ? 1 : -1;
+		return 0;
+# else
 		return utimes(fname, t);
+# endif
 #elif defined HAVE_STRUCT_UTIMBUF
 		struct utimbuf tbuf;
 		tbuf.actime = time(NULL);