moparisthebest
/
wget
mirror of https://github.com/moparisthebest/wget
1
0
Fork 0
Code Issues Releases Wiki Activity

HTML-escape dirname in href (not perfect, good enough).

This commit is contained in:
Micah Cowan 2008-11-12 21:44:48 -08:00
parent ca12585a0e
commit 02c211d47c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ChangeLog
View File

@ -1,6 +1,6 @@
2008-11-12 Micah Cowan <micah@cowan.name>
* ftp-ls.c (ftp_index): HTML-escape dir name in title, h1.
* ftp-ls.c (ftp_index): HTML-escape dir name in title, h1, a:href.
2008-11-12 Alexander Belopolsky <alexander.belopolsky@gmail.com>

8
src/ftp-ls.c
View File

@ -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, "</h1>\n<hr>\n<pre>\n");
xfree (htcldir);
while (f)
{
fprintf (fp, " ");
@ -934,7 +933,11 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f)
fprintf (fp, "<a href=\"ftp://%s%s:%d", upwd, u->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, "</pre>\n</body>\n</html>\n");
xfree (htcldir);
xfree (upwd);
if (!output_stream)
fclose (fp);