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

- make godoc restart feature work properly

Browse Source 
R=rsc
DELTA=11  (10 added, 0 deleted, 1 changed)
OCL=29007
CL=29009
This commit is contained in:
Robert Griesemer 2009-05-18 16:26:34 -07:00
parent 89df071165
commit 7ff2536633
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,6 +58,7 @@ var (
verbose = flag.Bool("v", false, "verbose mode");
// file system roots
launchdir string; // directory from which godoc was launched
goroot string;
pkgroot = flag.String("pkgroot", "src/lib", "root package source directory (if unrooted, relative to goroot)");
tmplroot = flag.String("tmplroot", "usr/gri/pretty", "root template directory (if unrooted, relative to goroot)");
@ -585,7 +586,10 @@ func loggingHandler(h http.Handler) http.Handler {
func restartGodoc(c *http.Conn, r *http.Request) {
binary := os.Args[0]; // TODO currently requires absolute paths because of chdir in the beginning
binary := os.Args[0];
if len(binary) > 0 || binary[0] != '/' {
binary = pathutil.Join(launchdir, binary);
}
pid, err := os.ForkExec(binary, os.Args, os.Environ(), "", []*os.File{os.Stdin, os.Stdout, os.Stderr});
if err != nil {
log.Stderrf("os.ForkExec(%s): %v", binary, err);
@ -621,6 +625,12 @@ func main() {
}
}
var err os.Error;
if launchdir, err = os.Getwd(); err != nil {
log.Stderrf("unable to determine current working directory - restart may fail");
launchdir = "";
}
if err := os.Chdir(goroot); err != nil {
log.Exitf("chdir %s: %v", goroot, err);
}