Commit 05ee5065 authored by Cuong Manh Le's avatar Cuong Manh Le Committed by Brad Fitzpatrick

syscall: correct comment in testGetdirentries

Correct comment about allocating big enough slice to copy result of
Getdirentries.

While at it, also convert from Dirent directly to slice of byte.

Updates #35092

Change-Id: I892de7953120622882e1561728e1e56b009a2351
Reviewed-on: https://go-review.googlesource.com/c/go/+/202880
Run-TryBot: Cuong Manh Le <cuong.manhle.vn@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent be64a19d
......@@ -66,14 +66,10 @@ func testGetdirentries(t *testing.T, count int) {
}
data := buf[:n]
for len(data) > 0 {
// syscall.Getdirentries's return value may be (and usually is) much
// smaller than a syscall.Dirent, which has lots of padding for
// the name at the end. The compiler's checkptr validation doesn't like
// that. So allocate direntMem that's always big enough, and use that
// when converting to *syscall.Dirent.
var direntMem [unsafe.Sizeof(syscall.Dirent{})]byte
copy(direntMem[:], data)
dirent := (*syscall.Dirent)(unsafe.Pointer(&direntMem[0]))
// If multiple Dirents are written into buf, sometimes when we reach the final one,
// we have cap(buf) < Sizeof(Dirent). So use an appropriate slice to copy from data.
var dirent syscall.Dirent
copy((*[unsafe.Sizeof(dirent)]byte)(unsafe.Pointer(&dirent))[:], data)
data = data[dirent.Reclen:]
name := make([]byte, dirent.Namlen)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment