qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 19:50:06 -07:00
Code Releases Activity

os: adjust error in Stat on windows

Browse Source 
Current code could return a non-nil os.FileInfo even if there is an error.
This is a bit incompatible with Stat on other OSes.

Change-Id: I37b608da234f957bb89b82509649de78ccc70bbb
Reviewed-on: https://go-review.googlesource.com/40330
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Hiroshi Ioka 2017-04-11 09:54:08 +09:00 committed by Brad Fitzpatrick
parent e367ba9eae
commit 5a8eae6d47
2 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/os/os_test.go
View File

@ -174,6 +174,45 @@ func TestStat(t *testing.T) {
}
}
func TestStatError(t *testing.T) {
defer chtmpdir(t)()
path := "no-such-file"
Remove(path) // Just in case
fi, err := Stat(path)
if err == nil {
t.Fatal("got nil, want error")
}
if fi != nil {
t.Errorf("got %v, want nil", fi)
}
if perr, ok := err.(*PathError); !ok {
t.Errorf("got %T, want %T", err, perr)
}
testenv.MustHaveSymlink(t)
link := "symlink"
Remove(link) // Just in case
err = Symlink(path, link)
if err != nil {
t.Fatal(err)
}
defer Remove(link)
fi, err = Stat(link)
if err == nil {
t.Fatal("got nil, want error")
}
if fi != nil {
t.Errorf("got %v, want nil", fi)
}
if perr, ok := err.(*PathError); !ok {
t.Errorf("got %T, want %T", err, perr)
}
}
func TestFstat(t *testing.T) {
path := sfdir + "/" + sfname
file, err1 := Open(path)

4
src/os/stat_windows.go
View File

@ -66,14 +66,14 @@ func Stat(name string) (FileInfo, error) {
for i := 0; i < 255; i++ {
fi, err = Lstat(name)
if err != nil {
return fi, err
return nil, err
}
if fi.Mode()&ModeSymlink == 0 {
return fi, nil
}
newname, err := Readlink(name)
if err != nil {
return fi, err
return nil, err
}
if isAbs(newname) {
name = newname