Commit 35367cc6 authored by Rob Pike's avatar Rob Pike

mime: use Scanner to read mime files during init

Also close the file when we're done.

R=bradfitz
CC=golang-dev
https://golang.org/cl/7363045
parent cbd2c7a2
...@@ -23,15 +23,11 @@ func loadMimeFile(filename string) { ...@@ -23,15 +23,11 @@ func loadMimeFile(filename string) {
if err != nil { if err != nil {
return return
} }
defer f.Close()
reader := bufio.NewReader(f) scanner := bufio.NewScanner(f)
for { for scanner.Scan() {
line, err := reader.ReadString('\n') fields := strings.Fields(scanner.Text())
if err != nil {
f.Close()
return
}
fields := strings.Fields(line)
if len(fields) <= 1 || fields[0][0] == '#' { if len(fields) <= 1 || fields[0][0] == '#' {
continue continue
} }
...@@ -43,6 +39,9 @@ func loadMimeFile(filename string) { ...@@ -43,6 +39,9 @@ func loadMimeFile(filename string) {
setExtensionType("."+ext, mimeType) setExtensionType("."+ext, mimeType)
} }
} }
if err := scanner.Err(); err != nil {
panic(err)
}
} }
func initMime() { func initMime() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment