Skip to content

Commit 22c30cd

Browse files
randall77randall77
committed
unix: remove raw syscall from getattrlistTimes
Update golang/go#17490 Change-Id: I29feed5ddea976b39bd4c43bd1ff5942f47df083 Reviewed-on: https://go-review.googlesource.com/c/154661 Reviewed-by: Brad Fitzpatrick <[email protected]>
1 parent 4dcd0b7 commit 22c30cd

13 files changed

+112
-13
lines changed

‎unix/syscall_darwin.go

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -293,21 +293,16 @@ func setattrlistTimes(path string, times []Timespec, flags int) error {
293293
if flags&AT_SYMLINK_NOFOLLOW != 0 {
294294
options |= FSOPT_NOFOLLOW
295295
}
296-
_, _, e1 := Syscall6(
297-
SYS_SETATTRLIST,
298-
uintptr(unsafe.Pointer(_p0)),
299-
uintptr(unsafe.Pointer(&attrList)),
300-
uintptr(unsafe.Pointer(&attributes)),
301-
uintptr(unsafe.Sizeof(attributes)),
302-
uintptr(options),
303-
0,
304-
)
305-
if e1 != 0 {
306-
return e1
307-
}
308-
return nil
296+
return setattrlist(
297+
_p0,
298+
unsafe.Pointer(&attrList),
299+
unsafe.Pointer(&attributes),
300+
unsafe.Sizeof(attributes),
301+
options)
309302
}
310303

304+
//sys setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error)
305+
311306
func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error {
312307
// Darwin doesn't support SYS_UTIMENSAT
313308
return ENOSYS

‎unix/zsyscall_darwin_386.1_12.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_386.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_386.s

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
8484
JMP libc_listxattr(SB)
8585
TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
8686
JMP libc_flistxattr(SB)
87+
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
88+
JMP libc_setattrlist(SB)
8789
TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
8890
JMP libc_kill(SB)
8991
TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

‎unix/zsyscall_darwin_amd64.1_12.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_amd64.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_amd64.s

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
8484
JMP libc_listxattr(SB)
8585
TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
8686
JMP libc_flistxattr(SB)
87+
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
88+
JMP libc_setattrlist(SB)
8789
TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
8890
JMP libc_kill(SB)
8991
TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

‎unix/zsyscall_darwin_arm.1_12.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm.s

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
8484
JMP libc_listxattr(SB)
8585
TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
8686
JMP libc_flistxattr(SB)
87+
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
88+
JMP libc_setattrlist(SB)
8789
TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
8890
JMP libc_kill(SB)
8991
TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

‎unix/zsyscall_darwin_arm64.1_12.go

Lines changed: 14 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm64.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎unix/zsyscall_darwin_arm64.s

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
8484
JMP libc_listxattr(SB)
8585
TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
8686
JMP libc_flistxattr(SB)
87+
TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
88+
JMP libc_setattrlist(SB)
8789
TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
8890
JMP libc_kill(SB)
8991
TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

0 commit comments

Comments
 (0)