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

src/pkg/os/file.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 198 matching lines @@
 // Mkdir creates a new directory with the specified name and permission bits.
 // It returns an error, if any.
 func Mkdir(name string, perm int) Error {
         e := syscall.Mkdir(name, perm)
         if e != 0 {
                 return &PathError{"mkdir", name, Errno(e)}
         }
         return nil
 }
 
-// Stat returns a Dir structure describing the named file and an error, if any.
-// If name names a valid symbolic link, the returned Dir describes
-// the file pointed at by the link and has dir.FollowedSymlink set to true.
-// If name names an invalid symbolic link, the returned Dir describes
-// the link itself and has dir.FollowedSymlink set to false.
-func Stat(name string) (dir *Dir, err Error) {
+// Stat returns a FileInfo structure describing the named file and an error, if any.
+// If name names a valid symbolic link, the returned FileInfo describes
+// the file pointed at by the link and has fi.FollowedSymlink set to true.
+// If name names an invalid symbolic link, the returned FileInfo describes
+// the link itself and has fi.FollowedSymlink set to false.
+func Stat(name string) (fi *FileInfo, err Error) {
         var lstat, stat syscall.Stat_t
         e := syscall.Lstat(name, &lstat)
         if e != 0 {
                 return nil, &PathError{"stat", name, Errno(e)}
         }
         statp := &lstat
         if lstat.Mode&syscall.S_IFMT == syscall.S_IFLNK {
                 e := syscall.Stat(name, &stat)
                 if e == 0 {
                         statp = &stat
                 }
         }
-        return dirFromStat(name, new(Dir), &lstat, statp), nil
-}
-
-// Stat returns the Dir structure describing file.
-// It returns the Dir and an error, if any.
-func (file *File) Stat() (dir *Dir, err Error) {
+        return fileInfoFromStat(name, new(FileInfo), &lstat, statp), nil
+}
+
+// Stat returns the FileInfo structure describing file.
+// It returns the FileInfo and an error, if any.
+func (file *File) Stat() (fi *FileInfo, err Error) {
         var stat syscall.Stat_t
         e := syscall.Fstat(file.fd, &stat)
         if e != 0 {
                 return nil, &PathError{"stat", file.name, Errno(e)}
         }
-        return dirFromStat(file.name, new(Dir), &stat, &stat), nil
-}
-
-// Lstat returns the Dir structure describing the named file and an error, if any.
-// If the file is a symbolic link, the returned Dir describes the
-// symbolic link.  Lstat makes no attempt to follow the link.
-func Lstat(name string) (dir *Dir, err Error) {
+        return fileInfoFromStat(file.name, new(FileInfo), &stat, &stat), nil
+}
+
+// Lstat returns the FileInfo structure describing the named file and an
+// error, if any.  If the file is a symbolic link, the returned FileInfo
+// describes the symbolic link.  Lstat makes no attempt to follow the link.
+func Lstat(name string) (fi *FileInfo, err Error) {
         var stat syscall.Stat_t
         e := syscall.Lstat(name, &stat)
         if e != 0 {
                 return nil, &PathError{"lstat", name, Errno(e)}
         }
-        return dirFromStat(name, new(Dir), &stat, &stat), nil
+        return fileInfoFromStat(name, new(FileInfo), &stat, &stat), nil
 }
 
 // Chdir changes the current working directory to the named directory.
 func Chdir(dir string) Error {
         if e := syscall.Chdir(dir); e != 0 {
                 return &PathError{"chdir", dir, Errno(e)}
         }
         return nil
 }
 
@@ skipping 146 matching lines @@
 }
 
 // Truncate changes the size of the file.
 // It does not change the I/O offset.
 func (f *File) Truncate(size int64) Error {
         if e := syscall.Ftruncate(f.fd, size); e != 0 {
                 return &PathError{"truncate", f.name, Errno(e)}
         }
         return nil
 }