diff options
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/fetch/ftp.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/usr.bin/fetch/ftp.c b/usr.bin/fetch/ftp.c index 097250565d6f..362d1c9b77d2 100644 --- a/usr.bin/fetch/ftp.c +++ b/usr.bin/fetch/ftp.c @@ -26,7 +26,7 @@ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: ftp.c,v 1.7 1997/05/31 14:45:41 ache Exp $ + * $Id: ftp.c,v 1.8 1997/10/06 01:09:56 fenner Exp $ */ #include <sys/types.h> @@ -173,7 +173,17 @@ ftp_parse(struct fetch_state *fs, const char *uri) dp = ftps->ftp_remote_dirs; while ((s = strchr(s, '/')) != 0) { *s++ = '\0'; - *dp++ = percent_decode(r); + /* + * Skip double-slashes. According to RFC1738, + * double-slashes mean "send 'CWD '", which is + * a syntax error to most FTP servers. Instead, + * we just pretend that multiple slashes are a + * single slash. + */ + if (*r == '\0') + ftps->ftp_remote_ndirs--; + else + *dp++ = percent_decode(r); r = s; } } else { |