diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-02-18 09:50:58 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-02-18 09:53:27 +0100 |
| commit | 91664defe0a75da15661a37a7f585b0c8523bf4e (patch) | |
| tree | 8d7133037ce477c00ba0408d3f0892e0a8b5744d /src/cmd/godoc/utils.go | |
| parent | ac2d3c9eb73a2d23848c55c3171d8ff6dd0feed9 (diff) | |
| download | golang-91664defe0a75da15661a37a7f585b0c8523bf4e.tar.gz | |
Imported Upstream version 2011.02.15
Diffstat (limited to 'src/cmd/godoc/utils.go')
| -rw-r--r-- | src/cmd/godoc/utils.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/godoc/utils.go b/src/cmd/godoc/utils.go index a032bd331..cc028cc4d 100644 --- a/src/cmd/godoc/utils.go +++ b/src/cmd/godoc/utils.go @@ -60,10 +60,10 @@ func canonicalizePaths(list []string, filter func(path string) bool) []string { continue // ignore empty paths (don't assume ".") } // len(path) > 0: normalize path - if path[0] != '/' { - path = pathutil.Join(cwd, path) - } else { + if pathutil.IsAbs(path) { path = pathutil.Clean(path) + } else { + path = pathutil.Join(cwd, path) } // we have a non-empty absolute path if filter != nil && !filter(path) { |