fix: handle read errors correctly

felixge · felixge · commit dab678ecf5dc · 2015-01-11T17:47:42.000+01:00
diff --git a/xxd.go b/xxd.go
@@ -45,8 +45,11 @@ func XXD(r io.Reader, w io.Writer) error {
 	r = bufio.NewReader(r)
 	for {
 		n, err := io.ReadFull(r, line)
-		if n == 0 || err == io.EOF {
-			break
+		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
+			return err
+		}
+		if n == 0 {
+			return nil
 		}
 
 		// Line offset
@@ -88,5 +91,4 @@ func XXD(r io.Reader, w io.Writer) error {
 
 		w.Write(newline)
 	}
-	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,11 @@ func XXD(r io.Reader, w io.Writer) error {`
`45`	`45`	`r = bufio.NewReader(r)`
`46`	`46`	`for {`
`47`	`47`	`n, err := io.ReadFull(r, line)`
`48`		`- if n == 0 \|\| err == io.EOF {`
`49`		`- break`
	`48`	`+ if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {`
	`49`	`+ return err`
	`50`	`+ }`
	`51`	`+ if n == 0 {`
	`52`	`+ return nil`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`// Line offset`
`@@ -88,5 +91,4 @@ func XXD(r io.Reader, w io.Writer) error {`
`88`	`91`
`89`	`92`	`w.Write(newline)`
`90`	`93`	`}`
`91`		`- return nil`
`92`	`94`	`}`