mirror of
https://github.com/golang/go
synced 2024-11-18 09:44:50 -07:00
cmd/doc: show the true import path rather than "."
Change-Id: I7b15c027c15eefc2a004eb61491e828a7fbefc54 Reviewed-on: https://go-review.googlesource.com/9513 Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
parent
632778c3a3
commit
1ab60c2930
@ -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
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user