brouzouf/ftp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore previous behavior for List

Browse Source 
Fixes #251
This commit is contained in:
Julien Laffaye 2022-03-10 15:20:11 -05:00
parent 813c8a8384
commit d2c44e311e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conn_test.go
View File

@ -173,7 +173,7 @@ func (mock *ftpMock) listen() {
mock.dataConn.Wait() mock.dataConn.Wait()
mock.printfLine("150 Opening ASCII mode data connection for file list") mock.printfLine("150 Opening ASCII mode data connection for file list")
mock.dataConn.write([]byte("-rw-r--r-- 1 ftp wheel 0 Jan 29 10:29 lo")) mock.dataConn.write([]byte("-rw-r--r-- 1 ftp wheel 0 Jan 29 10:29 lo\r\ntotal 1"))
mock.printfLine("226 Transfer complete") mock.printfLine("226 Transfer complete")
mock.closeDataConn() mock.closeDataConn()
case "NLST": case "NLST":

4
ftp.go
View File

@ -640,9 +640,7 @@ func (c *ServerConn) List(path string) (entries []*Entry, err error) {
now := time.Now() now := time.Now()
for scanner.Scan() { for scanner.Scan() {
entry, errParse := parser(scanner.Text(), now, c.options.location) entry, errParse := parser(scanner.Text(), now, c.options.location)
if errParse != nil { if errParse == nil {
errs = multierror.Append(errs, errParse)
} else {
entries = append(entries, entry) entries = append(entries, entry)
} }
} }