Update dependencies

vendor/github.com/pkg/sftp/request-example.go

@@ -11,7 +11,6 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
-	"strconv"
 	"sync"
 	"time"
 )
@@ -26,7 +25,7 @@ func InMemHandler() Handlers {
 }
 
 // Handlers
-func (fs *root) Fileread(r Request) (io.ReaderAt, error) {
+func (fs *root) Fileread(r *Request) (io.ReaderAt, error) {
 	fs.filesLock.Lock()
 	defer fs.filesLock.Unlock()
 	file, err := fs.fetch(r.Filepath)
@@ -42,7 +41,7 @@ func (fs *root) Fileread(r Request) (io.ReaderAt, error) {
 	return file.ReaderAt()
 }
 
-func (fs *root) Filewrite(r Request) (io.WriterAt, error) {
+func (fs *root) Filewrite(r *Request) (io.WriterAt, error) {
 	fs.filesLock.Lock()
 	defer fs.filesLock.Unlock()
 	file, err := fs.fetch(r.Filepath)
@@ -60,7 +59,7 @@ func (fs *root) Filewrite(r Request) (io.WriterAt, error) {
 	return file.WriterAt()
 }
 
-func (fs *root) Filecmd(r Request) error {
+func (fs *root) Filecmd(r *Request) error {
 	fs.filesLock.Lock()
 	defer fs.filesLock.Unlock()
 	switch r.Method {
@@ -101,20 +100,27 @@ func (fs *root) Filecmd(r Request) error {
 	return nil
 }
 
-func (fs *root) Fileinfo(r Request) ([]os.FileInfo, error) {
+type listerat []os.FileInfo
+
+// Modeled after strings.Reader's ReadAt() implementation
+func (f listerat) ListAt(ls []os.FileInfo, offset int64) (int, error) {
+	var n int
+	if offset >= int64(len(f)) {
+		return 0, io.EOF
+	}
+	n = copy(ls, f[offset:])
+	if n < len(ls) {
+		return n, io.EOF
+	}
+	return n, nil
+}
+
+func (fs *root) Filelist(r *Request) (ListerAt, error) {
 	fs.filesLock.Lock()
 	defer fs.filesLock.Unlock()
+
 	switch r.Method {
 	case "List":
-		var err error
-		batch_size := 10
-		current_offset := 0
-		if token := r.LsNext(); token != "" {
-			current_offset, err = strconv.Atoi(token)
-			if err != nil {
-				return nil, os.ErrInvalid
-			}
-		}
 		ordered_names := []string{}
 		for fn, _ := range fs.files {
 			if filepath.Dir(fn) == r.Filepath {
@@ -126,21 +132,13 @@ func (fs *root) Fileinfo(r Request) ([]os.FileInfo, error) {
 		for i, fn := range ordered_names {
 			list[i] = fs.files[fn]
 		}
-		if len(list) < current_offset {
-			return nil, io.EOF
-		}
-		new_offset := current_offset + batch_size
-		if new_offset > len(list) {
-			new_offset = len(list)
-		}
-		r.LsSave(strconv.Itoa(new_offset))
-		return list[current_offset:new_offset], nil
+		return listerat(list), nil
 	case "Stat":
 		file, err := fs.fetch(r.Filepath)
 		if err != nil {
 			return nil, err
 		}
-		return []os.FileInfo{file}, nil
+		return listerat([]os.FileInfo{file}), nil
 	case "Readlink":
 		file, err := fs.fetch(r.Filepath)
 		if err != nil {
@@ -152,7 +150,7 @@ func (fs *root) Fileinfo(r Request) ([]os.FileInfo, error) {
 				return nil, err
 			}
 		}
-		return []os.FileInfo{file}, nil
+		return listerat([]os.FileInfo{file}), nil
 	}
 	return nil, nil
 }