freebsd: use utimensat syscall in favor of utimes

samuelkarp · samuelkarp · commit bb87682d41f1 · 2020-12-07T23:11:54.000-08:00
The utimes syscall follows symlinks and changes the times on the link
target, rather than the link itself.  The lutimes syscall can be used to
modify times on a symlink, though both syscalls are deprecated in favor
of utimensat.  utimensat can be called with the AF_SYMLINK_NOFOLLOW flag
to change the times on a symlink.

Signed-off-by: Samuel Karp &lt;me@samuelkarp.com&gt;
diff --git a/fs/copy_darwinopenbsdsolaris.go b/fs/copy_darwinopenbsdsolaris.go
@@ -33,3 +33,8 @@ func copyDevice(dst string, fi os.FileInfo) error {
 	}
 	return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))
 }
+
+func utimesNano(name string, atime, mtime syscall.Timespec) error {
+	timespec := []syscall.Timespec{atime, mtime}
+	return syscall.UtimesNano(name, timespec)
+}
diff --git a/fs/copy_freebsd.go b/fs/copy_freebsd.go
@@ -33,3 +33,10 @@ func copyDevice(dst string, fi os.FileInfo) error {
 	}
 	return unix.Mknod(dst, uint32(fi.Mode()), st.Rdev)
 }
+
+func utimesNano(name string, atime, mtime syscall.Timespec) error {
+	at := unix.NsecToTimespec(atime.Nano())
+	mt := unix.NsecToTimespec(mtime.Nano())
+	utimes := [2]unix.Timespec{at, mt}
+	return unix.UtimesNanoAt(unix.AT_FDCWD, name, utimes[0:], unix.AT_SYMLINK_NOFOLLOW)
+}
diff --git a/fs/copy_unix.go b/fs/copy_unix.go
@@ -52,8 +52,7 @@ func copyFileInfo(fi os.FileInfo, name string) error {
 		}
 	}
 
-	timespec := []syscall.Timespec{StatAtime(st), StatMtime(st)}
-	if err := syscall.UtimesNano(name, timespec); err != nil {
+	if err := utimesNano(name, StatAtime(st), StatMtime(st)); err != nil {
 		return errors.Wrapf(err, "failed to utime %s", name)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,8 @@ func copyDevice(dst string, fi os.FileInfo) error {`
`33`	`33`	`}`
`34`	`34`	`return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+func utimesNano(name string, atime, mtime syscall.Timespec) error {`
	`38`	`+ timespec := []syscall.Timespec{atime, mtime}`
	`39`	`+ return syscall.UtimesNano(name, timespec)`
	`40`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -33,3 +33,10 @@ func copyDevice(dst string, fi os.FileInfo) error {`
`33`	`33`	`}`
`34`	`34`	`return unix.Mknod(dst, uint32(fi.Mode()), st.Rdev)`
`35`	`35`	`}`
	`36`	`+`
	`37`	`+func utimesNano(name string, atime, mtime syscall.Timespec) error {`
	`38`	`+ at := unix.NsecToTimespec(atime.Nano())`
	`39`	`+ mt := unix.NsecToTimespec(mtime.Nano())`
	`40`	`+ utimes := [2]unix.Timespec{at, mt}`
	`41`	`+ return unix.UtimesNanoAt(unix.AT_FDCWD, name, utimes[0:], unix.AT_SYMLINK_NOFOLLOW)`
	`42`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -52,8 +52,7 @@ func copyFileInfo(fi os.FileInfo, name string) error {`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- timespec := []syscall.Timespec{StatAtime(st), StatMtime(st)}`
`56`		`- if err := syscall.UtimesNano(name, timespec); err != nil {`
	`55`	`+ if err := utimesNano(name, StatAtime(st), StatMtime(st)); err != nil {`
`57`	`56`	`return errors.Wrapf(err, "failed to utime %s", name)`
`58`	`57`	`}`
`59`	`58`