Fix some fd leaks from os.Open

diff --git a/src/config.go b/src/config.go
index 536bf2f6177ce3205e0d7bf3350639155f9f29a2..26443b2847d34b7ec696a2dc460a7d29a5676f4f 100644 (file)
--- a/src/config.go
+++ b/src/config.go
@@ -36,6 +36,8 @@ func ReadFromFile(aPath string, config *Configuration) os.Error {
        if error != nil {
                return error
        }
+       defer fd.Close()
+
        decoder := json.NewDecoder(fd)
        return decoder.Decode(config)
 }

diff --git a/src/paths.go b/src/paths.go
index 417828d227ddbcbf5f71127a15f6d5b9f10f3aa1..ac5e25468592b41f15eb695f0cb89a6d5424b3f7 100644 (file)
--- a/src/paths.go
+++ b/src/paths.go
@@ -57,6 +57,7 @@ func List(the_path string) (files vector.StringVector, err os.Error) {
        if file_error != nil {
                return nil, file_error
        }
+       defer fd.Close()
 
        fileinfos, read_err := fd.Readdir(-1)
        if read_err != nil {

diff --git a/src/server.go b/src/server.go
index 508da5ad12f908bb819cd85bdea4788cca5e4a4b..7da8aae510a1b45a034aadd7edac4c6386761301 100644 (file)
--- a/src/server.go
+++ b/src/server.go
@@ -34,6 +34,8 @@ func indexHandler(response http.ResponseWriter, request *http.Request) {
                fmt.Print("Error opening file ", err.String(), "\n")
                return
        }
+       defer fd.Close()
+
        response.Header().Set("Content-Type", "text/html")
        io.Copy(response, fd)
 }