From: Shenghou Ma <minux.ma@gmail.com>
Date: Fri, 30 Nov 2012 16:42:50 +0000 (+0800)
Subject: cmd/godoc: fix `godoc net/http` on windows
X-Git-Tag: go1.1rc2~1743
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=279199ebccb87eb97f97bb8e8e41095400d90181;p=gostls13.git

cmd/godoc: fix `godoc net/http` on windows
`godoc net/http` used to complain "/target contains more than one package: http, main"

R=golang-dev, bradfitz, rsc
CC=golang-dev
https://golang.org/cl/6852100
---

diff --git a/src/cmd/godoc/godoc.go b/src/cmd/godoc/godoc.go
index 9ac38c746e..70e1984b2a 100644
--- a/src/cmd/godoc/godoc.go
+++ b/src/cmd/godoc/godoc.go
@@ -853,12 +853,12 @@ type docServer struct {
 
 // fsReadDir implements ReadDir for the go/build package.
 func fsReadDir(dir string) ([]os.FileInfo, error) {
-	return fs.ReadDir(dir)
+	return fs.ReadDir(filepath.ToSlash(dir))
 }
 
 // fsOpenFile implements OpenFile for the go/build package.
 func fsOpenFile(name string) (r io.ReadCloser, err error) {
-	data, err := ReadFile(fs, name)
+	data, err := ReadFile(fs, filepath.ToSlash(name))
 	if err != nil {
 		return nil, err
 	}