From 7140f393b2564fb9fcf963f1e6154428b9d6d6ad Mon Sep 17 00:00:00 2001 From: dan Date: Tue, 9 Jan 2001 20:17:06 -0800 Subject: [PATCH] [svn] When did the bug get fixed where recursive FTP would fail if logging in put you in a directory other than "/"? I don't see a src/ChangeLog entry for it. In any case, my testing shows that it's fixed in 1.7-dev, but TODO and a comment in src/ftp.c were not changed to reflect this. --- ChangeLog | 3 +++ TODO | 3 --- src/ChangeLog | 5 +++++ src/ftp.c | 3 --- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9887f30a..3f2de993 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2001-01-09 Dan Harkless * TODO: If -c is on, don't re-download a 100%-downloaded file. + Also, the bug where you couldn't recurse into ftp directories if + logging in put you somewhere else besides the server's "/" + directory got fixed without the TODO entry for it being removed. 2001-01-06 Dan Harkless diff --git a/TODO b/TODO index f7e97eae..d4330169 100644 --- a/TODO +++ b/TODO @@ -51,9 +51,6 @@ changes. * Make -K compare X.orig to X and move the former on top of the latter if they're the same, rather than leaving identical .orig files laying around. -* Allow mirroring of FTP URLs where logging in puts you somewhere else besides - '/'. - * If CGI output is saved to a file, e.g. cow.cgi?param, -k needs to change the '?' to a "%3F" in links to that file to avoid passing part of the filename as a parameter. diff --git a/src/ChangeLog b/src/ChangeLog index c2fc00d2..064e72f5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -6,6 +6,11 @@ * url.c (write_backup_file): Clarified a comment. + * ftp.c (ftp_retrieve_dirs): I don't see a ChangeLog entry for + this, but the bug where recursion into FTP directories didn't work + if logging in put you in a directory other than "/" is apparently + fixed now. Removed the comment here warning of the bug. + 2001-01-06 Dan Harkless * ChangeLog: The '[Not in 1.6 branch.]'s were decided not to be diff --git a/src/ftp.c b/src/ftp.c index d38ed012..74efff5e 100644 --- a/src/ftp.c +++ b/src/ftp.c @@ -1442,9 +1442,6 @@ ftp_retrieve_dirs (struct urlinfo *u, struct fileinfo *f, ccon *con) if (len > current_length) current_container = (char *)alloca (len); u->dir = current_container; - /* When retrieving recursively, all directories must be - absolute. This restriction will (hopefully!) be lifted in - the future. */ sprintf (u->dir, "/%s%s%s", odir + (*odir == '/'), (!*odir || (*odir == '/' && !* (odir + 1))) ? "" : "/", f->name); if (!accdir (u->dir, ALLABS)) -- 2.39.2