Merge pull request #34402 from dims/update-sftp-package

Automatic merge from submit-queue

Update sftp package

In support of #34328

Looks like some folks need:
4d0e916071

Godeps/Godeps.json

@@ -1834,7 +1834,7 @@
 		},
 		{
 			"ImportPath": "github.com/pkg/sftp",
-			"Rev": "a71e8f580e3b622ebff585309160b1cc549ef4d2"
+			"Rev": "4d0e916071f68db74f8a73926335f809396d6b42"
 		},
 		{
 			"ImportPath": "github.com/pmezard/go-difflib/difflib",

vendor/github.com/pkg/sftp/client.go

@@ -490,18 +490,13 @@ func (c *Client) Join(elem ...string) string { return path.Join(elem...) }
 // is not empty.
 func (c *Client) Remove(path string) error {
 	err := c.removeFile(path)
-	switch err := err.(type) {
-	case *StatusError:
+	if err, ok := err.(*StatusError); ok {
 		switch err.Code {
 		// some servers, *cough* osx *cough*, return EPERM, not ENODIR.
 		// serv-u returns ssh_FX_FILE_IS_A_DIRECTORY
 		case ssh_FX_PERMISSION_DENIED, ssh_FX_FAILURE, ssh_FX_FILE_IS_A_DIRECTORY:
 			return c.removeDirectory(path)
-		default:
-			return err
 		}
-	default:
-		return err
 	}
 	return err
 }

vendor/github.com/pkg/sftp/server_statvfs_linux.go

@@ -15,9 +15,8 @@ func statvfsFromStatfst(stat *syscall.Statfs_t) (*StatVFS, error) {
 		Bavail:  stat.Bavail,
 		Files:   stat.Files,
 		Ffree:   stat.Ffree,
-		Favail:  stat.Ffree,                                                            // not sure how to calculate Favail
-		Fsid:    uint64(uint64(stat.Fsid.X__val[1])<<32 | uint64(stat.Fsid.X__val[0])), // endianness?
-		Flag:    uint64(stat.Flags),                                                    // assuming POSIX?
+		Favail:  stat.Ffree,         // not sure how to calculate Favail
+		Flag:    uint64(stat.Flags), // assuming POSIX?
 		Namemax: uint64(stat.Namelen),
 	}, nil
 }