os: fix windows build

TBR=brainman
CC=golang-dev
https://golang.org/cl/5449048

diff --git a/src/pkg/os/export_test.go b/src/pkg/os/export_test.go
index 29f051162af092b8d794a875512f0a6aecf9a61b..9c6ef429744daf31b7b7ee6389b70f7715fc5f2c 100644 (file)
--- a/src/pkg/os/export_test.go
+++ b/src/pkg/os/export_test.go
@@ -6,5 +6,4 @@ package os
 
 // Export for testing.
 
-var TimespecToTime = timespecToTime
 var Atime = atime

diff --git a/src/pkg/os/stat_windows.go b/src/pkg/os/stat_windows.go
index d024915ee08bb2e153394bcb73dde0a1fc5528bd..ddecd1118f6a0d70c2b986f8bb1ed762a142fd09 100644 (file)
--- a/src/pkg/os/stat_windows.go
+++ b/src/pkg/os/stat_windows.go
@@ -77,7 +77,11 @@ func basename(name string) string {
        return name
 }
 
-func toFileInfo(name string, fa, sizehi, sizelo uint32, ctime, atime, wtime syscall.Filetime) FileInfo {
+type winTimes struct {
+       atime, ctime syscall.Filetime
+}
+
+func toFileInfo(name string, fa, sizehi, sizelo uint32, ctime, atime, mtime syscall.Filetime) FileInfo {
        fs := new(FileStat)
        fs.mode = 0
        if fa&syscall.FILE_ATTRIBUTE_DIRECTORY != 0 {
@@ -90,10 +94,16 @@ func toFileInfo(name string, fa, sizehi, sizelo uint32, ctime, atime, wtime sysc
        }
        fs.size = int64(sizehi)<<32 + int64(sizelo)
        fs.name = name
-       fs.modTime = time.Unix(0, wtime.Nanoseconds())
+       fs.modTime = time.Unix(0, mtime.Nanoseconds())
+       fs.Sys = &winTimes{atime, ctime}
        return fs
 }
 
 func sameFile(fs1, fs2 *FileStat) bool {
        return false
 }
+
+// For testing.
+func atime(fi FileInfo) time.Time {
+       return time.Unix(0, fi.(*FileStat).Sys.(*winTimes).atime.Nanoseconds())
+}