Merge pull request #864 from jbenet/fix/fuse-read

jbenet · jbenet · commit f17521b76f0d · 2015-03-06T16:36:21.000-08:00
take offset into account for computing read size
diff --git a/fuse/readonly/readonly_unix.go b/fuse/readonly/readonly_unix.go
@@ -170,7 +170,7 @@ func (s *Node) Read(ctx context.Context, req *fuse.ReadRequest, resp *fuse.ReadR
 		return err
 	}
 
-	buf := resp.Data[:min(req.Size, int(r.Size()))]
+	buf := resp.Data[:min(req.Size, int(r.Size()-req.Offset))]
 	n, err := io.ReadFull(r, buf)
 	if err != nil && err != io.EOF {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ func (s Node) Read(ctx context.Context, req fuse.ReadRequest, resp *fuse.ReadR`
`170`	`170`	`return err`
`171`	`171`	`}`
`172`	`172`
`173`		`- buf := resp.Data[:min(req.Size, int(r.Size()))]`
	`173`	`+ buf := resp.Data[:min(req.Size, int(r.Size()-req.Offset))]`
`174`	`174`	`n, err := io.ReadFull(r, buf)`
`175`	`175`	`if err != nil && err != io.EOF {`
`176`	`176`	`return err`