os: add support for long path names on freebsd RemoveAll

Follow CL 146020 and enable RemoveAll based on Unlinkat and Openat on
freebsd.

Since the layout of syscall.Stat_t changes in FreeBSD 12, Fstatat needs
a compatibility wrapper akin to Fstatat in x/sys/unix. See CL 138595 and
CL 136816 for details.

Updates #27029

Change-Id: I8851a5b7fa658eaa6e69a1693150b16d9a68f36a
Reviewed-on: https://go-review.googlesource.com/c/146597
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Yuval Pavel Zholkover <paulzhol@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>

diff --git a/src/internal/syscall/unix/at.go b/src/internal/syscall/unix/at.go
index 1c05d2abe33af9b18efd341cb9ba75707b6a78b2..c007c87b20c2303c58b0f733e11cb87fc49439da 100644 (file)
--- a/src/internal/syscall/unix/at.go
+++ b/src/internal/syscall/unix/at.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin freebsd openbsd netbsd dragonfly
+// +build linux darwin openbsd netbsd dragonfly
 
 package unix
 

diff --git a/src/internal/syscall/unix/at_freebsd.go b/src/internal/syscall/unix/at_freebsd.go
new file mode 100644 (file)
index 0000000..e171f4d
--- /dev/null
+++ b/src/internal/syscall/unix/at_freebsd.go
@@ -0,0 +1,47 @@
+// Copyright 2018 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.
+
+package unix
+
+import (
+       "syscall"
+       "unsafe"
+)
+
+const (
+       AT_REMOVEDIR        = 0x800
+       AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+func Unlinkat(dirfd int, path string, flags int) error {
+       p, err := syscall.BytePtrFromString(path)
+       if err != nil {
+               return err
+       }
+
+       _, _, errno := syscall.Syscall(syscall.SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(p)), uintptr(flags))
+       if errno != 0 {
+               return errno
+       }
+
+       return nil
+}
+
+func Openat(dirfd int, path string, flags int, perm uint32) (int, error) {
+       p, err := syscall.BytePtrFromString(path)
+       if err != nil {
+               return 0, err
+       }
+
+       fd, _, errno := syscall.Syscall6(syscall.SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(p)), uintptr(flags), uintptr(perm), 0, 0)
+       if errno != 0 {
+               return 0, errno
+       }
+
+       return int(fd), nil
+}
+
+func Fstatat(dirfd int, path string, stat *syscall.Stat_t, flags int) error {
+       return syscall.Fstatat(dirfd, path, stat, flags)
+}

diff --git a/src/internal/syscall/unix/at_sysnum_freebsd.go b/src/internal/syscall/unix/at_sysnum_freebsd.go
deleted file mode 100644 (file)
index fe45e29..0000000
--- a/src/internal/syscall/unix/at_sysnum_freebsd.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2018 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.
-
-package unix
-
-import "syscall"
-
-const unlinkatTrap uintptr = syscall.SYS_UNLINKAT
-const openatTrap uintptr = syscall.SYS_OPENAT
-const fstatatTrap uintptr = syscall.SYS_FSTATAT
-
-const AT_REMOVEDIR = 0x800
-const AT_SYMLINK_NOFOLLOW = 0x200

diff --git a/src/os/removeall_at.go b/src/os/removeall_at.go
index b7ed2aa6d411d1b06d6674911b082a75b946349a..12d8152bec9cb6d7ae00920ab43c0e69bf8fa692 100644 (file)
--- a/src/os/removeall_at.go
+++ b/src/os/removeall_at.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin openbsd netbsd dragonfly solaris
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package os
 

diff --git a/src/os/removeall_noat.go b/src/os/removeall_noat.go
index 02af047d6e03a77f1d527bd713c8e74fad914582..f8af0da87f6186a9761111ee854b0a4187b231b2 100644 (file)
--- a/src/os/removeall_noat.go
+++ b/src/os/removeall_noat.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !linux,!darwin,!openbsd,!netbsd,!dragonfly,!solaris
+// +build !linux,!darwin,!freebsd,!openbsd,!netbsd,!dragonfly,!solaris
 
 package os
 

diff --git a/src/os/removeall_test.go b/src/os/removeall_test.go
index 93a6733d6abfe338f35528d0c5ef29c7051b1bfc..4daf8c298b3ac42f59484d139cf5e6bc6d83b0a9 100644 (file)
--- a/src/os/removeall_test.go
+++ b/src/os/removeall_test.go
@@ -162,7 +162,7 @@ func TestRemoveAllLarge(t *testing.T) {
 
 func TestRemoveAllLongPath(t *testing.T) {
        switch runtime.GOOS {
-       case "linux", "darwin", "openbsd", "netbsd", "dragonfly", "solaris":
+       case "linux", "darwin", "freebsd", "openbsd", "netbsd", "dragonfly", "solaris":
                break
        default:
                t.Skip("skipping for not implemented platforms")
@@ -212,7 +212,7 @@ func TestRemoveAllLongPath(t *testing.T) {
 
 func TestRemoveAllDot(t *testing.T) {
        switch runtime.GOOS {
-       case "linux", "darwin", "openbsd", "netbsd", "dragonfly", "solaris":
+       case "linux", "darwin", "freebsd", "openbsd", "netbsd", "dragonfly", "solaris":
                break
        default:
                t.Skip("skipping for not implemented platforms")

diff --git a/src/syscall/syscall_freebsd.go b/src/syscall/syscall_freebsd.go
index d6f75098c0981f43c9e77572d52eda5b57577f44..19ace227d5a90afe0f62405d8728f6b2e2621e01 100644 (file)
--- a/src/syscall/syscall_freebsd.go
+++ b/src/syscall/syscall_freebsd.go
@@ -223,6 +223,20 @@ func Fstat(fd int, st *Stat_t) (err error) {
        return nil
 }
 
+func Fstatat(fd int, path string, st *Stat_t, flags int) (err error) {
+       var oldStat stat_freebsd11_t
+       if supportsABI(_ino64First) {
+               return fstatat_freebsd12(fd, path, st, flags)
+       }
+       err = fstatat(fd, path, &oldStat, flags)
+       if err != nil {
+               return err
+       }
+
+       st.convertFrom(&oldStat)
+       return nil
+}
+
 func Statfs(path string, st *Statfs_t) (err error) {
        var oldStatfs statfs_freebsd11_t
        if supportsABI(_ino64First) {
@@ -403,6 +417,7 @@ func convertFromDirents11(buf []byte, old []byte) int {
 //sys  Fpathconf(fd int, name int) (val int, err error)
 //sys  fstat(fd int, stat *stat_freebsd11_t) (err error)
 //sys  fstat_freebsd12(fd int, stat *Stat_t) (err error) = _SYS_FSTAT_FREEBSD12
+//sys  fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error)
 //sys  fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) = _SYS_FSTATAT_FREEBSD12
 //sys  fstatfs(fd int, stat *statfs_freebsd11_t) (err error)
 //sys  fstatfs_freebsd12(fd int, stat *Statfs_t) (err error) = _SYS_FSTATFS_FREEBSD12

diff --git a/src/syscall/zsyscall_freebsd_386.go b/src/syscall/zsyscall_freebsd_386.go
index ba7ea27f8d9293a17de0ae2ec5bec4b9d8392931..8f4234c7e9d206c319e382fbbdbae4a0e18224af 100644 (file)
--- a/src/syscall/zsyscall_freebsd_386.go
+++ b/src/syscall/zsyscall_freebsd_386.go
@@ -483,6 +483,21 @@ func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
+       var _p0 *byte
+       _p0, err = BytePtrFromString(path)
+       if err != nil {
+               return
+       }
+       _, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+       if e1 != 0 {
+               err = errnoErr(e1)
+       }
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
        var _p0 *byte
        _p0, err = BytePtrFromString(path)

diff --git a/src/syscall/zsyscall_freebsd_amd64.go b/src/syscall/zsyscall_freebsd_amd64.go
index 4b519a7f7f310cecb2383b8a74f13eb1feeb5dd3..baa7d68a7d2e6550bdea142f6726271f83391a85 100644 (file)
--- a/src/syscall/zsyscall_freebsd_amd64.go
+++ b/src/syscall/zsyscall_freebsd_amd64.go
@@ -483,6 +483,21 @@ func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
+       var _p0 *byte
+       _p0, err = BytePtrFromString(path)
+       if err != nil {
+               return
+       }
+       _, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+       if e1 != 0 {
+               err = errnoErr(e1)
+       }
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
        var _p0 *byte
        _p0, err = BytePtrFromString(path)

diff --git a/src/syscall/zsyscall_freebsd_arm.go b/src/syscall/zsyscall_freebsd_arm.go
index e89707654bc3045406676b00e78f612bcc771013..16e4bc5414438cad50ef71cac6be3aed5b86122b 100644 (file)
--- a/src/syscall/zsyscall_freebsd_arm.go
+++ b/src/syscall/zsyscall_freebsd_arm.go
@@ -483,6 +483,21 @@ func fstat_freebsd12(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fstatat(fd int, path string, stat *stat_freebsd11_t, flags int) (err error) {
+       var _p0 *byte
+       _p0, err = BytePtrFromString(path)
+       if err != nil {
+               return
+       }
+       _, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+       if e1 != 0 {
+               err = errnoErr(e1)
+       }
+       return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func fstatat_freebsd12(fd int, path string, stat *Stat_t, flags int) (err error) {
        var _p0 *byte
        _p0, err = BytePtrFromString(path)