Mirrors/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-12-07 23:00:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

sftpd: remove workarounds for directory listing

Browse Source 
The underlying issue was fixed in pkg/sftp 1.13.2
This commit is contained in:
Nicola Murino
2021-07-11 16:26:40 +02:00
parent bd5191dfc5
commit 7344366ce8
4 changed files with 4 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
vfs/sftpfs.go
View File

@@ -206,13 +206,7 @@ func (fs *SFTPFs) Stat(name string) (os.FileInfo, error) {
if err := fs.checkConnection(); err != nil {
return nil, err
}
info, err := fs.sftpClient.Stat(name)
if err != nil {
return nil, err
}
fi := NewFileInfo(info.Name(), info.IsDir(), info.Size(), info.ModTime(), false)
fi.SetMode(info.Mode())
return fi, nil
return fs.sftpClient.Stat(name)
}
// Lstat returns a FileInfo describing the named file
@@ -220,13 +214,7 @@ func (fs *SFTPFs) Lstat(name string) (os.FileInfo, error) {
if err := fs.checkConnection(); err != nil {
return nil, err
}
info, err := fs.sftpClient.Lstat(name)
if err != nil {
return nil, err
}
fi := NewFileInfo(info.Name(), info.IsDir(), info.Size(), info.ModTime(), false)
fi.SetMode(info.Mode())
return fi, nil
return fs.sftpClient.Lstat(name)
}
// Open opens the named file for reading
@@ -407,18 +395,7 @@ func (fs *SFTPFs) ReadDir(dirname string) ([]os.FileInfo, error) {
if err := fs.checkConnection(); err != nil {
return nil, err
}
entries, err := fs.sftpClient.ReadDir(dirname)
if err != nil {
return nil, err
}
result := make([]os.FileInfo, 0, len(entries))
for _, entry := range entries {
info := NewFileInfo(entry.Name(), entry.IsDir(), entry.Size(), entry.ModTime(), false)
info.SetMode(entry.Mode())
result = append(result, info)
}
return result, nil
return fs.sftpClient.ReadDir(dirname)
}
// IsUploadResumeSupported returns true if resuming uploads is supported.