clones/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2024-10-02 07:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

godoc: accept symbolic links as path names provided to -path

Browse Source 
When providing addition file systems to godoc via -path, the
path names may be symbolic links. Follow them.

Also: better logging of error and special conditions.

R=r, dsymonds, r2
CC=golang-dev
https://golang.org/cl/4217045
This commit is contained in:
Robert Griesemer 2011-02-24 16:24:51 -08:00
parent 176eb49d9c
commit 27ccb41c4a
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import (
"go/parser"
"go/token"
"io/ioutil"
"log"
"os"
pathutil "path"
"strings"
@ -100,7 +101,13 @@ func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth i
return &Directory{depth, path, name, "", nil}
}
list, _ := ioutil.ReadDir(path) // ignore errors
list, err := ioutil.ReadDir(path)
if err != nil {
// newDirTree is called with a path that should be a package
// directory; errors here should not happen, but if they do,
// we want to know about them
log.Printf("ioutil.ReadDir(%s): %s", path, err)
}
// determine number of subdirectories and if there are package files
ndirs := 0
@ -188,8 +195,16 @@ func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth i
// (i.e., in this case the tree may contain directories w/o any package files).
//
func newDirectory(root string, pathFilter func(string) bool, maxDepth int) *Directory {
d, err := os.Lstat(root)
if err != nil || !isPkgDir(d) {
// The root could be a symbolic link so use os.Stat not os.Lstat.
d, err := os.Stat(root)
// If we fail here, report detailed error messages; otherwise
// is is hard to see why a directory tree was not built.
switch {
case err != nil:
log.Printf("newDirectory(%s): %s", root, err)
return nil
case !isPkgDir(d):
log.Printf("newDirectory(%s): not a package directory", root)
return nil
}
if maxDepth < 0 {

7
src/cmd/godoc/godoc.go
View File

@ -213,9 +213,10 @@ func initDirTrees() {
if *filter != "" {
list, err := readDirList(*filter)
if err != nil {
log.Printf("%s", err)
} else if len(list) == 0 {
log.Printf("no directory paths in file %s", *filter)
log.Printf("readDirList(%s): %s", *filter, err)
}
if *verbose || len(list) == 0 {
log.Printf("found %d directory paths in file %s", len(list), *filter)
}
setPathFilter(list)
}