From: Robert Griesemer <gri@golang.org>
Date: Fri, 11 Feb 2011 00:32:51 +0000 (-0800)
Subject: godoc: godoc: Use IsAbs to test for absolute paths (fix for win32).
X-Git-Tag: weekly.2011-02-15~31
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a75e5fc670acb860dda0ded0646f5d2bcab26122;p=gostls13.git

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
---

diff --git a/src/cmd/godoc/utils.go b/src/cmd/godoc/utils.go
index a032bd3311..cc028cc4d7 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) {