separated out utility functions

Makefile

@@ -7,8 +7,8 @@ all: obsidian
 obsidian: main.${O}
 	${LD} -o $@ main.${O}
 
-main.${O}: main.go
-	${GC} -o $@ main.go
+main.${O}: main.go util.go
+	${GC} -o $@ main.go util.go
 
 clean:
 	rm obsidian *.${O}

main.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"http"
-	"io/ioutil"
 	"opts"
 	"os"
 	"path"
@@ -16,27 +15,6 @@ var blogroot = opts.Option("r",
 	"the root directory for blog data",
 	"/usr/share/obsidian")
 
-func ReadDir(dirname string) (ret []*os.FileInfo) {
-	ret, err := ioutil.ReadDir(dirname)
-	if err != nil {
-		// the directory doesn't exist - create it
-		err = os.MkdirAll(dirname, 0755)
-	}
-	return
-}
-
-func ReadFile(filename string) (contents string) {
-	contentarry, err := ioutil.ReadFile(filename)
-	if err != nil {
-		// the file doesn't exist - create the directory and the file
-		dirname, _ := path.Split(filename)
-		err = os.MkdirAll(dirname, 0755)
-		ioutil.WriteFile(filename, []byte{}, 0644)
-	}
-	contents = string(contentarry)
-	return
-}
-
 func main() {
 	// option setup
 	opts.Description("lightweight http blog server")
@@ -69,10 +47,10 @@ var (
 
 func readTemplate(name string) string {
 	templateDirectory := path.Join(*blogroot,"templates")
-	return ReadFile(path.Join(templateDirectory, name))
+	return readFile(path.Join(templateDirectory, name))
 }
 
-func readData() {
+func readTemplates() {
 	// read the templates
 	genTemplate = readTemplate("gen.html")
 	adminTemplate = readTemplate("admin.html")
@@ -82,6 +60,10 @@ func readData() {
 	categoryTemplate = readTemplate("category.html")
 }
 
+func readData() {
+	readTemplates()
+}
+
 func TestServer(c *http.Conn, req *http.Request) {
 	fmt.Fprintf(c,"Hello, world!\n")
 }

util.go

@@ -0,0 +1,35 @@
+package main
+
+import (
+	"io/ioutil"
+	"os"
+	"path"
+)
+
+func readDir(dirname string) (ret []*os.FileInfo) {
+	ret, err := ioutil.ReadDir(dirname)
+	if err != nil {
+		// the directory doesn't exist - create it
+		err = os.MkdirAll(dirname, 0755)
+	}
+	return
+}
+
+func walkDir(dirname string, v path.Visitor) {
+	// first make sure the directory exists
+	readDir(dirname)
+	// now walk it
+	path.Walk(dirname, v, nil)
+}
+
+func readFile(filename string) (contents string) {
+	contentarry, err := ioutil.ReadFile(filename)
+	if err != nil {
+		// the file doesn't exist - create the directory and the file
+		dirname, _ := path.Split(filename)
+		err = os.MkdirAll(dirname, 0755)
+		ioutil.WriteFile(filename, []byte{}, 0644)
+	}
+	contents = string(contentarry)
+	return
+}