From b8aa2fe3d1a8f0e9d6cd327485b034c7e7f4c22f Mon Sep 17 00:00:00 2001
From: Dave Cheney <dave@cheney.net>
Date: Fri, 15 Nov 2013 22:04:14 +1100
Subject: [PATCH] Fixed Read, removed ReadAt

ReadAt should be replaced by Seek when the fs interface provides it.
---
 client.go                  | 23 +++++++++++------------
 client_integration_test.go | 35 -----------------------------------
 2 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/client.go b/client.go
index 4899b89..3b16c3f 100644
--- a/client.go
+++ b/client.go
@@ -493,18 +493,17 @@ func (f *File) Close() error {
 // bytes read and an error, if any. EOF is signaled by a zero count with
 // err set to io.EOF.
 func (f *File) Read(b []byte) (int, error) {
-	n, err := f.c.readAt(f.handle, f.offset, b)
-	f.offset += uint64(n)
-	return int(n), err
-}
-
-// ReadAt reads len(b) bytes from the File starting at byte offset off. It
-// returns the number of bytes read and the error, if any. ReadAt always
-// returns a non-nil error when n < len(b). At end of file, that error is
-// io.EOF.
-func (f *File) ReadAt(b []byte, off int64) (int, error) {
-	n, err := f.c.readAt(f.handle, uint64(off), b)
-	return int(n), err
+	var read int
+	for len(b) > 0 {
+		n, err := f.c.readAt(f.handle, f.offset, b[:min(len(b), maxWritePacket)])
+		f.offset += uint64(n)
+		read += int(n)
+		if err != nil {
+			return read, err
+		}
+		b = b[n:]
+	}
+	return read, nil
 }
 
 // Stat returns the FileInfo structure describing file. If there is an
diff --git a/client_integration_test.go b/client_integration_test.go
index 61b99ba..b79a9db 100644
--- a/client_integration_test.go
+++ b/client_integration_test.go
@@ -146,41 +146,6 @@ var readAtTests = []struct {
 	{"Hello world!", 12, "", io.EOF},
 }
 
-func TestClientReadAt(t *testing.T) {
-	sftp, cmd := testClient(t, READONLY)
-	defer cmd.Wait()
-	defer sftp.Close()
-
-	for _, tt := range readAtTests {
-		f, err := ioutil.TempFile("", "sftptest")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer os.Remove(f.Name())
-
-		if _, err := f.WriteString(tt.s); err != nil {
-			t.Fatal(err)
-		}
-		if err := f.Close(); err != nil {
-			t.Fatal(err)
-		}
-
-		got, err := sftp.Open(f.Name())
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer got.Close()
-
-		var b = make([]byte, 100)
-		n, err := got.ReadAt(b, tt.at)
-		b = b[:n]
-
-		if want, got := tt.want, string(b); got != want || tt.err != err {
-			t.Fatalf("Read(): want %q %v, got %q %v", want, tt.err, got, err)
-		}
-	}
-}
-
 func TestClientCreate(t *testing.T) {
 	sftp, cmd := testClient(t, READWRITE)
 	defer cmd.Wait()