Skip to content

Commit 1e3dc3d

Browse files
committed
syscall: make Utimes on Solaris match all the other geese
Updates #14892 Change-Id: I640c6e1635ccdf611f219521a7d297a9885c4cb3 Reviewed-on: https://go-review.googlesource.com/31446 Run-TryBot: Brad Fitzpatrick <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Ian Lance Taylor <[email protected]>
1 parent 4859f6a commit 1e3dc3d

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

src/syscall/syscall_solaris.go

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ func UtimesNano(path string, ts []Timespec) (err error) {
279279
tv[i].Sec = ts[i].Sec
280280
tv[i].Usec = ts[i].Nsec / 1000
281281
}
282-
return Utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
282+
return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
283283
}
284284

285285
//sys fcntl(fd int, cmd int, arg int) (val int, err error)
@@ -494,7 +494,7 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
494494
//sys Ftruncate(fd int, length int64) (err error)
495495
//sys Umask(newmask int) (oldmask int)
496496
//sys Unlink(path string) (err error)
497-
//sys Utimes(path string, times *[2]Timeval) (err error)
497+
//sys utimes(path string, times *[2]Timeval) (err error)
498498
//sys bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_bind
499499
//sys connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_connect
500500
//sys mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
@@ -527,3 +527,10 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
527527
}
528528
return
529529
}
530+
531+
func Utimes(path string, tv []Timeval) error {
532+
if len(tv) != 2 {
533+
return EINVAL
534+
}
535+
return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
536+
}

src/syscall/zsyscall_solaris_amd64.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ func Unlink(path string) (err error) {
953953
return
954954
}
955955

956-
func Utimes(path string, times *[2]Timeval) (err error) {
956+
func utimes(path string, times *[2]Timeval) (err error) {
957957
var _p0 *byte
958958
_p0, err = BytePtrFromString(path)
959959
if err != nil {

0 commit comments

Comments
 (0)