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

diff --git a/src/pkg/mime/type_unix.go b/src/pkg/mime/type_unix.go
index 88eb83a735d167b34b157c220cfe22bd00208403..857a0ab6765d83114ef2f02bb64ad4c1cd557711 100644 (file)
--- a/src/pkg/mime/type_unix.go
+++ b/src/pkg/mime/type_unix.go
@@ -23,15 +23,11 @@ func loadMimeFile(filename string) {
        if err != nil {
                return
        }
+       defer f.Close()
 
-       reader := bufio.NewReader(f)
-       for {
-               line, err := reader.ReadString('\n')
-               if err != nil {
-                       f.Close()
-                       return
-               }
-               fields := strings.Fields(line)
+       scanner := bufio.NewScanner(f)
+       for scanner.Scan() {
+               fields := strings.Fields(scanner.Text())
                if len(fields) <= 1 || fields[0][0] == '#' {
                        continue
                }
@@ -43,6 +39,9 @@ func loadMimeFile(filename string) {
                        setExtensionType("."+ext, mimeType)
                }
        }
+       if err := scanner.Err(); err != nil {
+               panic(err)
+       }
 }
 
 func initMime() {