"); + for i, entry := range list { + if entry.IsDirectory() { + printLink(c, path, entry.Name); + } + } + + // 2) .go files + fmt.Fprintln(c, "
"); + for i, entry := range list { + if isGoFile(&entry) { + printLink(c, path, entry.Name); + } + } + + // 3) everything else + fmt.Fprintln(c, "
");
+ for i, entry := range list {
+ if !entry.IsDirectory() && !isGoFile(&entry) {
+ fmt.Fprintf(c, "%s
\n", entry.Name);
+ }
+ }
+}
+
+
+func serveFile(c *http.Conn, filename string) {
var flags Compilation.Flags;
- prog, nerrors := Compilation.Compile(filename, &flags);
+ prog, nerrors := Compilation.Compile(*root + filename, &flags);
if nerrors > 0 {
c.WriteHeader(http.StatusNotFound);
- fmt.Fprintf(c, "compilation errors: %s\n", filename);
+ fmt.Fprintf(c, "Error: File has compilation errors (%s)\n", filename);
return;
}
@@ -65,19 +112,50 @@ func docServer(c *http.Conn, req *http.Request) {
}
-func main() {
- flag.Parse();
-
+func serve(c *http.Conn, req *http.Request) {
if *verbose {
- fmt.Printf("Go Documentation Server\n");
- fmt.Printf("port = %s\n", *port);
- fmt.Printf("root = %s\n", *root);
+ log.Stdoutf("URL = %s\n", req.RawUrl);
}
- http.Handle(urlPrefix + "/", http.HandlerFunc(docServer));
- err := http.ListenAndServe(":" + *port, nil);
+ path := Utils.SanitizePath(req.Url.Path);
+ dir, err := os.Stat(*root + path);
if err != nil {
- panic("ListenAndServe: ", err.String())
+ c.WriteHeader(http.StatusNotFound);
+ fmt.Fprintf(c, "Error: %v (%s)\n", err, path);
+ return;
+ }
+
+ switch {
+ case dir.IsDirectory():
+ serveDir(c, path);
+ case isGoFile(dir):
+ serveFile(c, path);
+ default:
+ c.WriteHeader(http.StatusNotFound);
+ fmt.Fprintf(c, "Error: Not a directory or .go file (%s)\n", path);
+ }
+}
+
+
+func main() {
+ flag.Parse();
+
+ *root = Utils.SanitizePath(*root);
+ dir, err1 := os.Stat(*root);
+ if err1 != nil || !dir.IsDirectory() {
+ log.Exitf("root not found or not a directory: ", *root);
+ }
+
+ if *verbose {
+ log.Stdoutf("Go Documentation Server\n");
+ log.Stdoutf("port = %s\n", *port);
+ log.Stdoutf("root = %s\n", *root);
+ }
+
+ http.Handle("/", http.HandlerFunc(serve));
+ err2 := http.ListenAndServe(":" + *port, nil);
+ if err2 != nil {
+ log.Exitf("ListenAndServe: ", err2.String())
}
}
diff --git a/usr/gri/pretty/printer.go b/usr/gri/pretty/printer.go
index a985e6abc11..d29bfd1ee6e 100644
--- a/usr/gri/pretty/printer.go
+++ b/usr/gri/pretty/printer.go
@@ -439,7 +439,7 @@ func (P *Printer) HtmlPackageName(pos int, name string) {
if P.html {
sname := name[1 : len(name)-1]; // strip quotes TODO do this elsewhere eventually
// TODO CAPITAL HACK BELOW FIX THIS
- P.TaggedString(pos, `"`, sname, `"`);
+ P.TaggedString(pos, `"`, sname, `"`);
} else {
P.String(pos, name);
}
diff --git a/usr/gri/pretty/utils.go b/usr/gri/pretty/utils.go
index 57a8d323a0e..1b925b4833b 100644
--- a/usr/gri/pretty/utils.go
+++ b/usr/gri/pretty/utils.go
@@ -18,6 +18,34 @@ func BaseName(s string) string {
}
+func cleanPath(s string) string {
+ for i := 0; i < len(s); i++ {
+ if s[i] == '/' {
+ i++;
+ j := i;
+ for j < len(s) && s[j] == '/' {
+ j++;
+ }
+ if j > i { // more then one '/'
+ return s[0 : i] + cleanPath(s[j : len(s)]);
+ }
+ }
+ }
+ return s;
+}
+
+
+// Reduce sequences of multiple '/'s into a single '/' and
+// strip any trailing '/' (may result in the empty string).
+func SanitizePath(s string) string {
+ s = cleanPath(s);
+ if s[len(s)-1] == '/' { // strip trailing '/'
+ s = s[0 : len(s)-1];
+ }
+ return s;
+}
+
+
func Contains(s, sub string, pos int) bool {
end := pos + len(sub);
return pos >= 0 && end <= len(s) && s[pos : end] == sub;