Parse files with no final newline characters properly

vancsj · Sep 18, 2013 · bf71521 · bf71521
1 parent 97be005
commit bf71521
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ini.go b/ini.go
@@ -70,13 +70,14 @@ func (f File) LoadFile(file string) (err error) {
 func parseFile(in *bufio.Reader, file File) (err error) {
 	section := file.Section("")
 	lineNum := 0
-	for {
+	for done := false; !done; {
 		var line string
 		if line, err = in.ReadString('\n'); err != nil {
 			if err == io.EOF {
-				break
+				done = true
+			} else {
+				return
 			}
-			return
 		}
 		lineNum++
 		line = strings.TrimSpace(line)

diff --git a/ini_test.go b/ini_test.go
@@ -18,8 +18,7 @@ func TestLoad(t *testing.T) {
   multiple = equals = signs
 
   [bar]
-  this = that
-  `
+  this = that`
 
 	file, err := Load(strings.NewReader(src))
 	if err != nil {