diff options
Diffstat (limited to 'src/pkg/os/getwd.go')
| -rw-r--r-- | src/pkg/os/getwd.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/pkg/os/getwd.go b/src/pkg/os/getwd.go index a0d3c99a5..81d8fed92 100644 --- a/src/pkg/os/getwd.go +++ b/src/pkg/os/getwd.go @@ -30,7 +30,7 @@ func Getwd() (pwd string, err error) { pwd = Getenv("PWD") if len(pwd) > 0 && pwd[0] == '/' { d, err := Stat(pwd) - if err == nil && dot.(*FileStat).SameFile(d.(*FileStat)) { + if err == nil && SameFile(dot, d) { return pwd, nil } } @@ -42,7 +42,7 @@ func Getwd() (pwd string, err error) { // Can't stat root - no hope. return "", err } - if root.(*FileStat).SameFile(dot.(*FileStat)) { + if SameFile(root, dot) { return "/", nil } @@ -52,7 +52,7 @@ func Getwd() (pwd string, err error) { pwd = "" for parent := ".."; ; parent = "../" + parent { if len(parent) >= 1024 { // Sanity check - return "", ENAMETOOLONG + return "", syscall.ENAMETOOLONG } fd, err := Open(parent) if err != nil { @@ -67,14 +67,14 @@ func Getwd() (pwd string, err error) { } for _, name := range names { d, _ := Lstat(parent + "/" + name) - if d.(*FileStat).SameFile(dot.(*FileStat)) { + if SameFile(d, dot) { pwd = "/" + name + pwd goto Found } } } fd.Close() - return "", ENOENT + return "", ErrNotExist Found: pd, err := fd.Stat() @@ -82,7 +82,7 @@ func Getwd() (pwd string, err error) { return "", err } fd.Close() - if pd.(*FileStat).SameFile(root.(*FileStat)) { + if SameFile(pd, root) { break } // Set up for next round. |