]> Cypherpunks repositories - gostls13.git/commitdiff
cmd/doc: show the true import path rather than "."
authorRob Pike <r@golang.org>
Wed, 29 Apr 2015 21:54:31 +0000 (14:54 -0700)
committerRob Pike <r@golang.org>
Wed, 29 Apr 2015 23:01:37 +0000 (23:01 +0000)
Change-Id: I7b15c027c15eefc2a004eb61491e828a7fbefc54
Reviewed-on: https://go-review.googlesource.com/9513
Reviewed-by: Russ Cox <rsc@golang.org>
src/cmd/doc/main.go

index 22694287e9a4f1169efb4e1681063b4090244c21..b3be2a975b7e4e683aa51ad4ecb40c7d8d9882c2 100644 (file)
@@ -89,7 +89,7 @@ func parseArgs() (*build.Package, string, string) {
                usage()
        case 0:
                // Easy: current directory.
-               return importDir("."), "", ""
+               return importDir(pwd()), "", ""
        case 1:
                // Done below.
        case 2:
@@ -156,7 +156,7 @@ func parseArgs() (*build.Package, string, string) {
                log.Fatalf("no such package %s", arg[0:period])
        }
        // Guess it's a symbol in the current directory.
-       return importDir("."), "", arg
+       return importDir(pwd()), "", arg
 }
 
 // importDir is just an error-catching wrapper for build.ImportDir.
@@ -285,3 +285,12 @@ func pathFor(root, pkg string) (result string) {
        filepath.Walk(root, visit)
        return "" // Call to panic above sets the real value.
 }
+
+// pwd returns the current directory.
+func pwd() string {
+       wd, err := os.Getwd()
+       if err != nil {
+               log.Fatal(err)
+       }
+       return wd
+}