qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-17 22:05:02 -07:00
Code Releases Activity

godoc: fix path problem for windows.

Browse Source 
R=golang-dev, gri
CC=golang-dev
https://golang.org/cl/4299044
This commit is contained in:
Yasuhiro Matsumoto 2011-03-17 22:27:30 -07:00 committed by Robert Griesemer
parent 61c83b6407
commit b22e29d9bf
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cmd/godoc/dirtrees.go
View File

@ -266,8 +266,8 @@ func (dir *Directory) lookupLocal(name string) *Directory {
// lookup looks for the *Directory for a given path, relative to dir.
func (dir *Directory) lookup(path string) *Directory {
d := strings.Split(dir.Path, "/", -1)
p := strings.Split(path, "/", -1)
d := strings.Split(dir.Path, string(filepath.Separator), -1)
p := strings.Split(path, string(filepath.Separator), -1)
i := 0
for i < len(d) {
if i >= len(p) || d[i] != p[i] {
@ -342,8 +342,8 @@ func (root *Directory) listing(skipRoot bool) *DirList {
if strings.HasPrefix(d.Path, root.Path) {
path = d.Path[len(root.Path):]
}
// remove trailing '/' if any - path must be relative
if len(path) > 0 && path[0] == '/' {
// remove trailing separator if any - path must be relative
if len(path) > 0 && filepath.IsAbs(path) {
path = path[1:]
}
p.Path = path

3
src/cmd/godoc/main.go
View File

@ -222,6 +222,9 @@ func main() {
flag.Usage = usage
flag.Parse()
// Clean goroot: normalize path separator.
*goroot = filepath.Clean(*goroot)
// Check usage: either server and no args, or command line and args
if (*httpAddr != "") != (flag.NArg() == 0) {
usage()