os: change return variable name for Getwd to avoid confusion

changed (pwd string) to (dir string), as some think pwd means passwd.
Fixes #7811.

LGTM=iant
R=golang-codereviews, iant, bradfitz
CC=golang-codereviews
https://golang.org/cl/89100043

diff --git a/src/pkg/os/getwd.go b/src/pkg/os/getwd.go
index 8c5ff7fca51a53ad64ab7e202e23d3061d095b6a..a72edeaee6e446cff958ef63a3830fd202e09a78 100644 (file)
--- a/src/pkg/os/getwd.go
+++ b/src/pkg/os/getwd.go
@@ -22,7 +22,7 @@ var useSyscallwd = func(error) bool { return true }
 // current directory.  If the current directory can be
 // reached via multiple paths (due to symbolic links),
 // Getwd may return any one of them.
-func Getwd() (pwd string, err error) {
+func Getwd() (dir string, err error) {
        // If the operating system provides a Getwd call, use it.
        if syscall.ImplementsGetwd {
                s, e := syscall.Getwd()
@@ -39,22 +39,22 @@ func Getwd() (pwd string, err error) {
 
        // Clumsy but widespread kludge:
        // if $PWD is set and matches ".", use it.
-       pwd = Getenv("PWD")
-       if len(pwd) > 0 && pwd[0] == '/' {
-               d, err := Stat(pwd)
+       dir = Getenv("PWD")
+       if len(dir) > 0 && dir[0] == '/' {
+               d, err := Stat(dir)
                if err == nil && SameFile(dot, d) {
-                       return pwd, nil
+                       return dir, nil
                }
        }
 
        // Apply same kludge but to cached dir instead of $PWD.
        getwdCache.Lock()
-       pwd = getwdCache.dir
+       dir = getwdCache.dir
        getwdCache.Unlock()
-       if len(pwd) > 0 {
-               d, err := Stat(pwd)
+       if len(dir) > 0 {
+               d, err := Stat(dir)
                if err == nil && SameFile(dot, d) {
-                       return pwd, nil
+                       return dir, nil
                }
        }
 
@@ -71,8 +71,8 @@ func Getwd() (pwd string, err error) {
 
        // General algorithm: find name in parent
        // and then find name of parent.  Each iteration
-       // adds /name to the beginning of pwd.
-       pwd = ""
+       // adds /name to the beginning of dir.
+       dir = ""
        for parent := ".."; ; parent = "../" + parent {
                if len(parent) >= 1024 { // Sanity check
                        return "", syscall.ENAMETOOLONG
@@ -91,7 +91,7 @@ func Getwd() (pwd string, err error) {
                        for _, name := range names {
                                d, _ := Lstat(parent + "/" + name)
                                if SameFile(d, dot) {
-                                       pwd = "/" + name + pwd
+                                       dir = "/" + name + dir
                                        goto Found
                                }
                        }
@@ -112,8 +112,8 @@ func Getwd() (pwd string, err error) {
 
        // Save answer as hint to avoid the expensive path next time.
        getwdCache.Lock()
-       getwdCache.dir = pwd
+       getwdCache.dir = dir
        getwdCache.Unlock()
 
-       return pwd, nil
+       return dir, nil
 }