platforms/firmata/client: use io.ReadFull

This CL uses io.ReadFull to make sure exactly n bytes are read, and correctly handle io.EOF and co. Fixes hybridgroup#343. Signed-off-by: Sebastien Binet <[email protected]> Conflicts: platforms/firmata/client/client.go
backwardn · Dec 3, 2016 · 9fc8828 · 9fc8828
1 parent 7ac80c0
commit 9fc8828
Showing 1 changed file with 3 additions and 15 deletions.
diff --git a/platforms/firmata/client/client.go b/platforms/firmata/client/client.go
@@ -315,21 +315,9 @@ func (b *Client) write(data []byte) (err error) {
 	return
 }
 
-func (b *Client) read(length int) (buf []byte, err error) {
-	i := 0
-	for length > 0 {
-		tmp := make([]byte, length)
-		if i, err = b.connection.Read(tmp); err != nil {
-			if err.Error() != "EOF" {
-				return
-			}
-			time.Sleep(5 * time.Millisecond)
-		}
-		if i > 0 {
-			buf = append(buf, tmp...)
-			length = length - i
-		}
-	}
+func (b *Client) read(n int) (buf []byte, err error) {
+	buf = make([]byte, n)
+	_, err = io.ReadFull(b.connection, buf)
 	return
 }