Commit 1ab60c29 authored by Rob Pike's avatar Rob Pike

cmd/doc: show the true import path rather than "."

Change-Id: I7b15c027c15eefc2a004eb61491e828a7fbefc54
Reviewed-on: https://go-review.googlesource.com/9513Reviewed-by: 's avatarRuss Cox <rsc@golang.org>
parent 632778c3
...@@ -89,7 +89,7 @@ func parseArgs() (*build.Package, string, string) { ...@@ -89,7 +89,7 @@ func parseArgs() (*build.Package, string, string) {
usage() usage()
case 0: case 0:
// Easy: current directory. // Easy: current directory.
return importDir("."), "", "" return importDir(pwd()), "", ""
case 1: case 1:
// Done below. // Done below.
case 2: case 2:
...@@ -156,7 +156,7 @@ func parseArgs() (*build.Package, string, string) { ...@@ -156,7 +156,7 @@ func parseArgs() (*build.Package, string, string) {
log.Fatalf("no such package %s", arg[0:period]) log.Fatalf("no such package %s", arg[0:period])
} }
// Guess it's a symbol in the current directory. // 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. // importDir is just an error-catching wrapper for build.ImportDir.
...@@ -285,3 +285,12 @@ func pathFor(root, pkg string) (result string) { ...@@ -285,3 +285,12 @@ func pathFor(root, pkg string) (result string) {
filepath.Walk(root, visit) filepath.Walk(root, visit)
return "" // Call to panic above sets the real value. 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
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment