diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-06-13 04:47:25 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2012-06-13 04:47:25 +0000 |
| commit | 57d195e2244c85b96baa4975de5a98aca45d53b6 (patch) | |
| tree | 46c11f99308277bb39550a919edf4549e01ee5af /libgo | |
| parent | f1dd0d9f3a3ecd169861623aeb2d35574b320104 (diff) | |
| download | gcc-57d195e2244c85b96baa4975de5a98aca45d53b6.zip gcc-57d195e2244c85b96baa4975de5a98aca45d53b6.tar.gz gcc-57d195e2244c85b96baa4975de5a98aca45d53b6.tar.bz2 | |
os: Use Entersyscall when reading directories.
From-SVN: r188494
Diffstat (limited to 'libgo')
| -rw-r--r-- | libgo/go/os/dir.go | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libgo/go/os/dir.go b/libgo/go/os/dir.go index c693aeb..02b21e6 100644 --- a/libgo/go/os/dir.go +++ b/libgo/go/os/dir.go @@ -42,7 +42,11 @@ func (file *File) readdirnames(n int) (names []string, err error) { if file.dirinfo == nil { file.dirinfo = new(dirInfo) file.dirinfo.buf = make([]byte, elen) - file.dirinfo.dir = libc_opendir(syscall.StringBytePtr(file.name)) + p := syscall.StringBytePtr(file.name) + syscall.Entersyscall() + r := libc_opendir(p) + syscall.Exitsyscall() + file.dirinfo.dir = r } entry_dirent := unsafe.Pointer(&file.dirinfo.buf[0]).(*syscall.Dirent) @@ -62,7 +66,10 @@ func (file *File) readdirnames(n int) (names []string, err error) { for n != 0 { var result *syscall.Dirent - i := libc_readdir_r(dir, entry_dirent, &result) + pr := &result + syscall.Entersyscall() + i := libc_readdir_r(dir, entry_dirent, pr) + syscall.Exitsyscall() if i != 0 { return names, NewSyscallError("readdir_r", i) } |