X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fftp-ls.c;fp=src%2Fftp-ls.c;h=181c8d452837807b96dc65e5c5ed36da9cd4a157;hp=d996b8adda9154096eb564050d434a6fca68e5d5;hb=02c211d47cb7ec6f3fdf6c10607c7172665327f0;hpb=ca12585a0e221e31a59898fe33f1a0caf7918f26 diff --git a/src/ftp-ls.c b/src/ftp-ls.c index d996b8ad..181c8d45 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -890,7 +890,6 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) fprintf (fp, _("Index of /%s on %s:%d"), htcldir, u->host, u->port); fprintf (fp, "\n
\n"); - xfree (htcldir); while (f) { fprintf (fp, " "); @@ -934,7 +933,11 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) fprintf (fp, "host, u->port); if (*u->dir != '/') putc ('/', fp); - fprintf (fp, "%s", u->dir); + /* XXX: Should probably URL-escape dir components here, rather + * than just HTML-escape, for consistency with the next bit where + * we use urlclfile for the file component. Anyway, this is safer + * than what we had... */ + fprintf (fp, "%s", htcldir); if (*u->dir) putc ('/', fp); fprintf (fp, "%s", urlclfile); @@ -954,6 +957,7 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) f = f->next; } fprintf (fp, "\n