Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 0 additions & 29 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"time"

"github.com/kr/fs"
"golang.org/x/crypto/ssh"

"github.com/pkg/sftp/internal/encoding/ssh/filexfer/openssh"
)
Expand Down Expand Up @@ -192,34 +191,6 @@ type Client struct {
disableConcurrentReads bool
}

// NewClient creates a new SFTP client on conn, using zero or more option
// functions.
func NewClient(conn *ssh.Client, opts ...ClientOption) (*Client, error) {
s, err := conn.NewSession()
if err != nil {
return nil, err
}

pw, err := s.StdinPipe()
if err != nil {
return nil, err
}
pr, err := s.StdoutPipe()
if err != nil {
return nil, err
}
perr, err := s.StderrPipe()
if err != nil {
return nil, err
}

if err := s.RequestSubsystem("sftp"); err != nil {
return nil, err
}

return newClientPipe(pr, perr, pw, s.Wait, opts...)
}

// NewClientPipe creates a new SFTP client given a Reader and a WriteCloser.
// This can be used for connecting to an SFTP server over TCP/TLS or by using
// the system's ssh client program (e.g. via exec.Command).
Expand Down
33 changes: 33 additions & 0 deletions client_ssh.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//go:build !pkg_sftp.omit_ssh

package sftp

import "golang.org/x/crypto/ssh"

// NewClient creates a new SFTP client on conn, using zero or more option
// functions.
func NewClient(conn *ssh.Client, opts ...ClientOption) (*Client, error) {
s, err := conn.NewSession()
if err != nil {
return nil, err
}

pw, err := s.StdinPipe()
if err != nil {
return nil, err
}
pr, err := s.StdoutPipe()
if err != nil {
return nil, err
}
perr, err := s.StderrPipe()
if err != nil {
return nil, err
}

if err := s.RequestSubsystem("sftp"); err != nil {
return nil, err
}

return newClientPipe(pr, perr, pw, s.Wait, opts...)
}