diff options
Diffstat (limited to 'src/pkg/os/dir_darwin.go')
-rw-r--r-- | src/pkg/os/dir_darwin.go | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/src/pkg/os/dir_darwin.go b/src/pkg/os/dir_darwin.go index 9b9d02ea8..7917daec6 100644 --- a/src/pkg/os/dir_darwin.go +++ b/src/pkg/os/dir_darwin.go @@ -5,12 +5,12 @@ package os import ( - "syscall"; - "unsafe"; + "syscall" + "unsafe" ) const ( - blockSize = 4096; // TODO(r): use statfs + blockSize = 4096 // TODO(r): use statfs ) // Readdirnames reads the contents of the directory associated with file and @@ -21,59 +21,59 @@ const ( func (file *File) Readdirnames(count int) (names []string, err Error) { // If this file has no dirinfo, create one. if file.dirinfo == nil { - file.dirinfo = new(dirInfo); + file.dirinfo = new(dirInfo) // The buffer must be at least a block long. // TODO(r): use fstatfs to find fs block size. - file.dirinfo.buf = make([]byte, blockSize); + file.dirinfo.buf = make([]byte, blockSize) } - d := file.dirinfo; - size := count; + d := file.dirinfo + size := count if size < 0 { size = 100 } - names = make([]string, 0, size); // Empty with room to grow. + names = make([]string, 0, size) // Empty with room to grow. for count != 0 { // Refill the buffer if necessary if d.bufp >= d.nbuf { - var errno int; - d.bufp = 0; + var errno int + d.bufp = 0 // Final argument is (basep *uintptr) and the syscall doesn't take nil. - d.nbuf, errno = syscall.Getdirentries(file.fd, d.buf, new(uintptr)); + d.nbuf, errno = syscall.Getdirentries(file.fd, d.buf, new(uintptr)) if errno != 0 { - d.nbuf = 0; - return names, NewSyscallError("getdirentries", errno); + d.nbuf = 0 + return names, NewSyscallError("getdirentries", errno) } if d.nbuf <= 0 { - break // EOF + break // EOF } } // Drain the buffer for count != 0 && d.bufp < d.nbuf { - dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp])); + dirent := (*syscall.Dirent)(unsafe.Pointer(&d.buf[d.bufp])) if dirent.Reclen == 0 { - d.bufp = d.nbuf; - break; + d.bufp = d.nbuf + break } - d.bufp += int(dirent.Reclen); - if dirent.Ino == 0 { // File absent in directory. + d.bufp += int(dirent.Reclen) + if dirent.Ino == 0 { // File absent in directory. continue } - bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0])); - var name = string(bytes[0:dirent.Namlen]); - if name == "." || name == ".." { // Useless names + bytes := (*[len(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0])) + var name = string(bytes[0:dirent.Namlen]) + if name == "." || name == ".." { // Useless names continue } - count--; + count-- if len(names) == cap(names) { - nnames := make([]string, len(names), 2*len(names)); + nnames := make([]string, len(names), 2*len(names)) for i := 0; i < len(names); i++ { nnames[i] = names[i] } - names = nnames; + names = nnames } - names = names[0 : len(names)+1]; - names[len(names)-1] = name; + names = names[0 : len(names)+1] + names[len(names)-1] = name } } - return names, nil; + return names, nil } |