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

Merge pull request #199 from ncw/fix-198

Browse Source 
Fix Stor() no longer reporting errors from the io.Reader passed in
This commit is contained in:
Julien Laffaye 2020-10-19 10:04:29 -04:00 committed by GitHub
commit 43afc84ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ftp.go
View File

@ -662,10 +662,13 @@ func (c *ServerConn) StorFrom(path string, r io.Reader, offset uint64) error {
// the response and we cannot use the connection to send other commands. // the response and we cannot use the connection to send other commands.
// So we don't check io.Copy error and we return the error from // So we don't check io.Copy error and we return the error from
// ReadResponse so the user can see the real error // ReadResponse so the user can see the real error
io.Copy(conn, r) _, err = io.Copy(conn, r)
conn.Close() conn.Close()
_, _, err = c.conn.ReadResponse(StatusClosingDataConnection) _, _, respErr := c.conn.ReadResponse(StatusClosingDataConnection)
if respErr != nil {
err = respErr
}
return err return err
} }
@ -681,10 +684,13 @@ func (c *ServerConn) Append(path string, r io.Reader) error {
} }
// see the comment for StorFrom above // see the comment for StorFrom above
io.Copy(conn, r) _, err = io.Copy(conn, r)
conn.Close() conn.Close()
_, _, err = c.conn.ReadResponse(StatusClosingDataConnection) _, _, respErr := c.conn.ReadResponse(StatusClosingDataConnection)
if respErr != nil {
err = respErr
}
return err return err
} }