code review 851045: os: mingw version of Readdir() and Stat() implemented

src/pkg/os/file_mingw.go

 // Copyright 2009 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.
 
 // The os package provides a platform-independent interface to operating
 // system functionality.  The design is Unix-like.
 package os
 
 import (
         "runtime"
@@ skipping 68 matching lines @@
                 err = &PathError{"close", file.name, Errno(e)}
         }
         file.fd = -1 // so it can't be closed again
 
         // no need for a finalizer anymore
         runtime.SetFinalizer(file, nil)
         return err
 }
 
 // Readdir reads the contents of the directory associated with file and
-// returns an array of up to count Dir structures, as would be returned
-// by Stat, in directory order.  Subsequent calls on the same file will yield further Dirs.
+// returns an array of up to count FileInfo structures, as would be returned
+// by Stat, in directory order.  Subsequent calls on the same file will yield
+// further FileInfos.
 // A negative count means to read until EOF.
 // Readdir returns the array and an Error, if any.
-func (file *File) Readdir(count int) (dirs []Dir, err Error) {
+func (file *File) Readdir(count int) (fi []FileInfo, err Error) {
         di := file.dirinfo
         size := count
         if size < 0 {
                 size = 100
         }
-        dirs = make([]Dir, 0, size) // Empty with room to grow.
+        fi = make([]FileInfo, 0, size) // Empty with room to grow.
         for count != 0 {
-                var s syscall.Stat_t
-                p := &s
                 if di.usefirststat {
                         di.usefirststat = false
-                        p = &di.stat
                 } else {
-                        _, e := syscall.FindNextFile(int32(file.fd), &s.Windata)
+                        _, e := syscall.FindNextFile(int32(file.fd), &di.stat.Windata)
                         if e != 0 {
                                 if e == syscall.ERROR_NO_MORE_FILES {
                                         break
                                 } else {
                                         return nil, &PathError{"FindNextFile", file.name, Errno(e)}
                                 }
                         }
                 }
-                var dir Dir
-                dirFromStat("", &dir, p, p)
-                if dir.Name == "." || dir.Name == ".." { // Useless names
+                var f FileInfo
+                fileInfoFromStat("", &f, &di.stat, &di.stat)
+                if f.Name == "." || f.Name == ".." { // Useless names
                         continue
                 }
                 count--
-                if len(dirs) == cap(dirs) {
-                        ndirs := make([]Dir, len(dirs), 2*len(dirs))
-                        for i := 0; i < len(dirs); i++ {
-                                ndirs[i] = dirs[i]
+                if len(fi) == cap(fi) {
+                        nfi := make([]FileInfo, len(fi), 2*len(fi))
+                        for i := 0; i < len(fi); i++ {
+                                nfi[i] = fi[i]
                         }
-                        dirs = ndirs
+                        fi = nfi
                 }
-                dirs = dirs[0 : len(dirs)+1]
-                dirs[len(dirs)-1] = dir
+                fi = fi[0 : len(fi)+1]
+                fi[len(fi)-1] = f
         }
-        return dirs, nil
+        return fi, nil
 }