summaryrefslogtreecommitdiff
path: root/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2020-05-21 09:53:49 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2020-05-21 09:53:49 -0400
commit2ecd15c0d236916d2894c87c73aeeeb08978614f (patch)
treec6b9f81b57d95b6ed290340fbdc065ec36d28b8f /vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
parente9b344266a563a3dfcf693fc817f6b8cc0b7d815 (diff)
downloadpodman-2ecd15c0d236916d2894c87c73aeeeb08978614f.tar.gz
podman-2ecd15c0d236916d2894c87c73aeeeb08978614f.tar.bz2
podman-2ecd15c0d236916d2894c87c73aeeeb08978614f.zip
Bump github.com/onsi/ginkgo from 1.12.0 to 1.12.2
Bumps [github.com/onsi/ginkgo](https://github.com/onsi/ginkgo) from 1.12.0 to 1.12.2. - [Release notes](https://github.com/onsi/ginkgo/releases) - [Changelog](https://github.com/onsi/ginkgo/blob/master/CHANGELOG.md) - [Commits](https://github.com/onsi/ginkgo/compare/v1.12.0...v1.12.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go')
-rw-r--r--vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go21
1 files changed, 14 insertions, 7 deletions
diff --git a/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go b/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
index f911617be..dc0befee3 100644
--- a/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
+++ b/vendor/golang.org/x/sys/unix/syscall_darwin.1_13.go
@@ -6,7 +6,11 @@
package unix
-import "unsafe"
+import (
+ "unsafe"
+
+ "golang.org/x/sys/internal/unsafeheader"
+)
//sys closedir(dir uintptr) (err error)
//sys readdir_r(dir uintptr, entry *Dirent, result **Dirent) (res Errno)
@@ -71,6 +75,7 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
cnt++
continue
}
+
reclen := int(entry.Reclen)
if reclen > len(buf) {
// Not enough room. Return for now.
@@ -79,13 +84,15 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
// restarting is O(n^2) in the length of the directory. Oh well.
break
}
+
// Copy entry into return buffer.
- s := struct {
- ptr unsafe.Pointer
- siz int
- cap int
- }{ptr: unsafe.Pointer(&entry), siz: reclen, cap: reclen}
- copy(buf, *(*[]byte)(unsafe.Pointer(&s)))
+ var s []byte
+ hdr := (*unsafeheader.Slice)(unsafe.Pointer(&s))
+ hdr.Data = unsafe.Pointer(&entry)
+ hdr.Cap = reclen
+ hdr.Len = reclen
+ copy(buf, s)
+
buf = buf[reclen:]
n += reclen
cnt++