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

godoc fix: relative paths were incorrect

Browse Source 
R=r
DELTA=13  (1 added, 6 deleted, 6 changed)
OCL=28840
CL=28844
This commit is contained in:
Robert Griesemer 2009-05-14 14:59:51 -07:00
parent ea79b82e92
commit 05851636f3
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr/gri/pretty/dirlist.html
View File

@ -1,3 +1,3 @@
{.repeated section Dirs}
<a href="{Path|html}/{Name|html}">{Name|html}</a><br />
{.repeated section @}
<a href="{Name|html}/">{Name|html}</a><br />
{.end}

15
usr/gri/pretty/godoc.go
View File

@ -448,12 +448,13 @@ func isPackageFile(dirname, filename, pakname string) bool {
}
// Returns the package denoted by importpath and the list of
// Returns the package denoted by path and the list of
// sub-directories in the corresponding package directory.
// If there is no such package, the first result is nil. If
// there are no sub-directories, that list is nil.
func findPackage(importpath string) (*pakDesc, dirList) {
func findPackage(path string) (*pakDesc, dirList) {
// get directory contents, if possible
importpath := pathutil.Clean(path); // no trailing '/'
dirname := pathutil.Join(*pkgroot, importpath);
if !isDir(dirname) {
return nil, nil;
@ -472,7 +473,7 @@ func findPackage(importpath string) (*pakDesc, dirList) {
}
// the package name is is the directory name within its parent
_, pakname := pathutil.Split(importpath);
_, pakname := pathutil.Split(dirname);
// collect all files belonging to the package and count the
// number of sub-directories
@ -562,15 +563,9 @@ func servePackage(c *http.Conn, desc *pakDesc) {
}
type Dirs struct {
Path string;
Dirs dirList;
}
func serveDirList(c *http.Conn, path string, dirs dirList) {
var buf io.ByteBuffer;
err := dirlistHtml.Execute(Dirs{path, dirs}, &buf);
err := dirlistHtml.Execute(dirs, &buf);
if err != nil {
log.Stderrf("dirlist.Execute: %s", err);
}