Commit a75e5fc6 authored by Robert Griesemer's avatar Robert Griesemer

godoc: godoc: Use IsAbs to test for absolute paths (fix for win32).

One more case.

R=r, r2
CC=golang-dev
https://golang.org/cl/4170044
parent 3b3568ba
...@@ -60,10 +60,10 @@ func canonicalizePaths(list []string, filter func(path string) bool) []string { ...@@ -60,10 +60,10 @@ func canonicalizePaths(list []string, filter func(path string) bool) []string {
continue // ignore empty paths (don't assume ".") continue // ignore empty paths (don't assume ".")
} }
// len(path) > 0: normalize path // len(path) > 0: normalize path
if path[0] != '/' { if pathutil.IsAbs(path) {
path = pathutil.Join(cwd, path)
} else {
path = pathutil.Clean(path) path = pathutil.Clean(path)
} else {
path = pathutil.Join(cwd, path)
} }
// we have a non-empty absolute path // we have a non-empty absolute path
if filter != nil && !filter(path) { if filter != nil && !filter(path) {
......
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