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

Use ReadResponse instead of ReadCodeLine.

Browse Source 
ReadResponse deals with multi-lines reponse, ReadCodeLine does not.
While I'm here, use the cmd() helper in epsv() method.
This commit is contained in:
Julien Laffaye 2013-05-19 21:23:29 +02:00
parent 91fc6ada34
commit 2257d14f75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ftp.go
View File

@ -88,11 +88,11 @@ func (c *ServerConn) Login(user, password string) error {
// epsv issues an "EPSV" command to get a port number for a data connection. // epsv issues an "EPSV" command to get a port number for a data connection.
func (c *ServerConn) epsv() (port int, err error) { func (c *ServerConn) epsv() (port int, err error) {
c.conn.Cmd("EPSV") _, line, err := c.cmd(StatusExtendedPassiveMode, "EPSV")
_, line, err := c.conn.ReadCodeLine(StatusExtendedPassiveMode)
if err != nil { if err != nil {
return return
} }
start := strings.Index(line, "|||") start := strings.Index(line, "|||")
end := strings.LastIndex(line, "|") end := strings.LastIndex(line, "|")
if start == -1 || end == -1 { if start == -1 || end == -1 {
@ -132,7 +132,7 @@ func (c *ServerConn) cmd(expected int, format string, args ...interface{}) (int,
return 0, "", err return 0, "", err
} }
code, line, err := c.conn.ReadCodeLine(expected) code, line, err := c.conn.ReadResponse(expected)
return code, line, err return code, line, err
} }