]> Cypherpunks repositories - gostls13.git/commitdiff
internal/syscall/unix: implement Eaccess on openbsd
authorTobias Klauser <tklauser@distanz.ch>
Mon, 8 Apr 2024 09:30:12 +0000 (11:30 +0200)
committerGopher Robot <gobot@golang.org>
Thu, 11 Apr 2024 16:36:52 +0000 (16:36 +0000)
Like on other BSDs, use faccessat(AT_FDCWD, path, mode, AT_EACCESS)

Change-Id: I80f8d327dd152576165b9206e32dfb749b41d187
Reviewed-on: https://go-review.googlesource.com/c/go/+/538836
Reviewed-by: Carlos Amedee <carlos@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Auto-Submit: Tobias Klauser <tobias.klauser@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>

src/internal/syscall/unix/asm_openbsd.s [new file with mode: 0644]
src/internal/syscall/unix/at_sysnum_openbsd.go
src/internal/syscall/unix/eaccess_bsd.go
src/internal/syscall/unix/eaccess_openbsd.go [new file with mode: 0644]
src/internal/syscall/unix/eaccess_other.go

diff --git a/src/internal/syscall/unix/asm_openbsd.s b/src/internal/syscall/unix/asm_openbsd.s
new file mode 100644 (file)
index 0000000..cc54a14
--- /dev/null
@@ -0,0 +1,10 @@
+// Copyright 2024 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build openbsd && !mips64
+
+#include "textflag.h"
+
+TEXT ·libc_faccessat_trampoline(SB),NOSPLIT,$0-0
+        JMP    libc_faccessat(SB)
index fd389477ec33d624820abb6d719071a730d6aab9..3b0c0dbd19cc46482b05c4818d4ca4e7b9cb4932 100644 (file)
@@ -10,7 +10,11 @@ const unlinkatTrap uintptr = syscall.SYS_UNLINKAT
 const openatTrap uintptr = syscall.SYS_OPENAT
 const fstatatTrap uintptr = syscall.SYS_FSTATAT
 
-const AT_REMOVEDIR = 0x08
-const AT_SYMLINK_NOFOLLOW = 0x02
+const (
+       AT_EACCESS          = 0x1
+       AT_FDCWD            = -0x64
+       AT_REMOVEDIR        = 0x08
+       AT_SYMLINK_NOFOLLOW = 0x02
 
-const UTIME_OMIT = -0x1
+       UTIME_OMIT = -0x1
+)
index 3411e3ac40c387fb309c40627e1bd63615f6923e..7077af17b672e5f1b7ad734a5da6b2f4fe322cd1 100644 (file)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build dragonfly || freebsd || netbsd
+//go:build dragonfly || freebsd || netbsd || (openbsd && mips64)
 
 package unix
 
diff --git a/src/internal/syscall/unix/eaccess_openbsd.go b/src/internal/syscall/unix/eaccess_openbsd.go
new file mode 100644 (file)
index 0000000..5e91f11
--- /dev/null
@@ -0,0 +1,36 @@
+// Copyright 2024 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+//go:build openbsd && !mips64
+
+package unix
+
+import (
+       "internal/abi"
+       "syscall"
+       "unsafe"
+)
+
+//go:linkname syscall_syscall6 syscall.syscall6
+func syscall_syscall6(fn, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
+
+func libc_faccessat_trampoline()
+
+//go:cgo_import_dynamic libc_faccessat faccessat "libc.so"
+
+func faccessat(dirfd int, path string, mode uint32, flags int) error {
+       p, err := syscall.BytePtrFromString(path)
+       if err != nil {
+               return err
+       }
+       _, _, errno := syscall_syscall6(abi.FuncPCABI0(libc_faccessat_trampoline), uintptr(dirfd), uintptr(unsafe.Pointer(p)), uintptr(mode), uintptr(flags), 0, 0)
+       if errno != 0 {
+               return errno
+       }
+       return err
+}
+
+func Eaccess(path string, mode uint32) error {
+       return faccessat(AT_FDCWD, path, mode, AT_EACCESS)
+}
index 19a2be587e4895a29ce0e15c48a80095680ddb5c..1a633ae857a2455c6d1e9f651a1fe8af0960a7f0 100644 (file)
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build unix && !dragonfly && !freebsd && !linux && !netbsd
+//go:build unix && !dragonfly && !freebsd && !linux && !openbsd && !netbsd
 
 package unix