[svn] Would incorrectly skip changing working directory when retrying after a

failed FTP attempt.

diff --git a/src/ChangeLog b/src/ChangeLog
index 6a963d6199000acce158b50f036c9caf1ee2dfc9..64177542c559f7809f097dac157e68af9cc9b572 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-17  Mike Grant  <mggr@pml.ac.uk>
+
+       * ftp.c (ftp_loop_internal): Would incorrectly skip changing
+       working directory when retrying after a failed FTP attempt.
+       Originally reported by Nate Eldredge.
+
 2006-10-12  Mauro Tortonesi  <mauro@ferrara.linux.it>
 
        * convert.c (downloaded_file): Fixed bug which used to break -E -k -K 

diff --git a/src/ftp.c b/src/ftp.c
index 9728c3394cfdc0257ae30884d73d80f498a52b0f..d122f4dc7173530105a408779eec4a8e27598c2b 100644 (file)
--- a/src/ftp.c
+++ b/src/ftp.c
@@ -1173,7 +1173,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
        len = 0;
       err = getftp (u, &len, restval, con);
 
-      if (con->csock != -1)
+      if (con->csock == -1)
        con->st &= ~DONE_CWD;
       else
        con->st |= DONE_CWD;