os: fix windows and plan9 builds

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/12519046

diff --git a/src/pkg/os/file.go b/src/pkg/os/file.go
index 32cac6d89a4d3e22d88cb47187f868756b23140d..00a8755f423648752ac54c3d0aedd83cb5e47aee 100644 (file)
--- a/src/pkg/os/file.go
+++ b/src/pkg/os/file.go
@@ -238,3 +238,6 @@ func Open(name string) (file *File, err error) {
 func Create(name string) (file *File, err error) {
        return OpenFile(name, O_RDWR|O_CREATE|O_TRUNC, 0666)
 }
+
+// lstat is overridden in tests.
+var lstat = Lstat

diff --git a/src/pkg/os/file_unix.go b/src/pkg/os/file_unix.go
index 06ff5bbfaeed4f5d6ae98313ec8654eaca178c01..855eb50ff59aec5392eaf3f229d5f9572b0e8b00 100644 (file)
--- a/src/pkg/os/file_unix.go
+++ b/src/pkg/os/file_unix.go
@@ -149,9 +149,6 @@ func Lstat(name string) (fi FileInfo, err error) {
        return fileInfoFromStat(&stat, name), nil
 }
 
-// lstat is overridden in tests.
-var lstat = Lstat
-
 func (f *File) readdir(n int) (fi []FileInfo, err error) {
        dirname := f.name
        if dirname == "" {