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]>
golang · Dec 20, 2018 · 22c30cd · 22c30cd
1 parent 4dcd0b7
commit 22c30cd
Show file tree

Hide file tree

Showing 13 changed files with 112 additions and 13 deletions.
diff --git a/unix/syscall_darwin.go b/unix/syscall_darwin.go
@@ -293,21 +293,16 @@ func setattrlistTimes(path string, times []Timespec, flags int) error {
 	if flags&AT_SYMLINK_NOFOLLOW != 0 {
 		options |= FSOPT_NOFOLLOW
 	}
-	_, _, e1 := Syscall6(
-		SYS_SETATTRLIST,
-		uintptr(unsafe.Pointer(_p0)),
-		uintptr(unsafe.Pointer(&attrList)),
-		uintptr(unsafe.Pointer(&attributes)),
-		uintptr(unsafe.Sizeof(attributes)),
-		uintptr(options),
-		0,
-	)
-	if e1 != 0 {
-		return e1
-	}
-	return nil
+	return setattrlist(
+		_p0,
+		unsafe.Pointer(&attrList),
+		unsafe.Pointer(&attributes),
+		unsafe.Sizeof(attributes),
+		options)
 }
 
+//sys setattrlist(path *byte, list unsafe.Pointer, buf unsafe.Pointer, size uintptr, options int) (err error)
+
 func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error {
 	// Darwin doesn't support SYS_UTIMENSAT
 	return ENOSYS

diff --git a/unix/zsyscall_darwin_386.1_12.go b/unix/zsyscall_darwin_386.1_12.go
diff --git a/unix/zsyscall_darwin_386.go b/unix/zsyscall_darwin_386.go
diff --git a/unix/zsyscall_darwin_386.s b/unix/zsyscall_darwin_386.s
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_listxattr(SB)
 TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_flistxattr(SB)
+TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
 TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_kill(SB)
 TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

diff --git a/unix/zsyscall_darwin_amd64.1_12.go b/unix/zsyscall_darwin_amd64.1_12.go
diff --git a/unix/zsyscall_darwin_amd64.go b/unix/zsyscall_darwin_amd64.go
diff --git a/unix/zsyscall_darwin_amd64.s b/unix/zsyscall_darwin_amd64.s
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_listxattr(SB)
 TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_flistxattr(SB)
+TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
 TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_kill(SB)
 TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

diff --git a/unix/zsyscall_darwin_arm.1_12.go b/unix/zsyscall_darwin_arm.1_12.go
diff --git a/unix/zsyscall_darwin_arm.go b/unix/zsyscall_darwin_arm.go
diff --git a/unix/zsyscall_darwin_arm.s b/unix/zsyscall_darwin_arm.s
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_listxattr(SB)
 TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_flistxattr(SB)
+TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
 TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_kill(SB)
 TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0

diff --git a/unix/zsyscall_darwin_arm64.1_12.go b/unix/zsyscall_darwin_arm64.1_12.go
diff --git a/unix/zsyscall_darwin_arm64.go b/unix/zsyscall_darwin_arm64.go
diff --git a/unix/zsyscall_darwin_arm64.s b/unix/zsyscall_darwin_arm64.s
@@ -84,6 +84,8 @@ TEXT ·libc_listxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_listxattr(SB)
 TEXT ·libc_flistxattr_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_flistxattr(SB)
+TEXT ·libc_setattrlist_trampoline(SB),NOSPLIT,$0-0
+	JMP	libc_setattrlist(SB)
 TEXT ·libc_kill_trampoline(SB),NOSPLIT,$0-0
 	JMP	libc_kill(SB)
 TEXT ·libc_ioctl_trampoline(SB),NOSPLIT,$0-0