/* Parsing FTP `ls' output.
- Copyright (C) 1996-2004 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This file is part of GNU Wget.
You should have received a copy of the GNU General Public License
along with Wget. If not, see <http://www.gnu.org/licenses/>.
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables. You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL". If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so. If you do not wish to do
-so, delete this exception statement from your version. */
+Additional permission under GNU GPL version 3 section 7
-#include <config.h>
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work. */
+
+#include "wget.h"
#include <stdio.h>
#include <stdlib.h>
#endif
#include <errno.h>
#include <time.h>
-
-#include "wget.h"
#include "utils.h"
#include "ftp.h"
#include "url.h"
-#include "convert.h" /* for html_quote_string prototype */
-#include "retr.h" /* for output_stream */
+#include "convert.h" /* for html_quote_string prototype */
+#include "retr.h" /* for output_stream */
/* Converts symbolic permissions to number-style ones, e.g. string
rwxr-xr-x to 755. For now, it knows nothing of
{
perms <<= 3;
perms += (((s[0] == 'r') << 2) + ((s[1] == 'w') << 1) +
- (s[2] == 'x' || s[2] == 's'));
+ (s[2] == 'x' || s[2] == 's'));
}
return perms;
}
if (!len) return 0;
if (line[len - 1] == '\n')
line[--len] = '\0';
+ if (!len) return 0;
if (line[len - 1] == '\r')
line[--len] = '\0';
for ( ; *line ; line++ ) if (*line == '\t') *line = ' ';
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
};
int next, len, i, error, ignore;
- int year, month, day; /* for time analysis */
+ int year, month, day; /* for time analysis */
int hour, min, sec;
struct tm timestruct, *tnow;
time_t timenow;
- char *line, *tok, *ptok; /* tokenizer */
+ char *line, *tok, *ptok; /* tokenizer */
struct fileinfo *dir, *l, cur; /* list creation */
fp = fopen (file, "rb");
len = clean_line (line);
/* Skip if total... */
if (!strncasecmp (line, "total", 5))
- {
- xfree (line);
- continue;
- }
+ {
+ xfree (line);
+ continue;
+ }
/* Get the first token (permissions). */
tok = strtok (line, " ");
if (!tok)
- {
- xfree (line);
- continue;
- }
+ {
+ xfree (line);
+ continue;
+ }
cur.name = NULL;
cur.linkto = NULL;
/* Decide whether we deal with a file or a directory. */
switch (*tok)
- {
- case '-':
- cur.type = FT_PLAINFILE;
- DEBUGP (("PLAINFILE; "));
- break;
- case 'd':
- cur.type = FT_DIRECTORY;
- DEBUGP (("DIRECTORY; "));
- break;
- case 'l':
- cur.type = FT_SYMLINK;
- DEBUGP (("SYMLINK; "));
- break;
- default:
- cur.type = FT_UNKNOWN;
- DEBUGP (("UNKNOWN; "));
- break;
- }
+ {
+ case '-':
+ cur.type = FT_PLAINFILE;
+ DEBUGP (("PLAINFILE; "));
+ break;
+ case 'd':
+ cur.type = FT_DIRECTORY;
+ DEBUGP (("DIRECTORY; "));
+ break;
+ case 'l':
+ cur.type = FT_SYMLINK;
+ DEBUGP (("SYMLINK; "));
+ break;
+ default:
+ cur.type = FT_UNKNOWN;
+ DEBUGP (("UNKNOWN; "));
+ break;
+ }
if (ignore_perms)
- {
- switch (cur.type)
- {
- case FT_PLAINFILE:
- cur.perms = 0644;
- break;
- case FT_DIRECTORY:
- cur.perms = 0755;
- break;
- default:
- /*cur.perms = 1023;*/ /* #### What is this? --hniksic */
- cur.perms = 0644;
- }
- DEBUGP (("implicit perms %0o; ", cur.perms));
- }
+ {
+ switch (cur.type)
+ {
+ case FT_PLAINFILE:
+ cur.perms = 0644;
+ break;
+ case FT_DIRECTORY:
+ cur.perms = 0755;
+ break;
+ default:
+ /*cur.perms = 1023;*/ /* #### What is this? --hniksic */
+ cur.perms = 0644;
+ }
+ DEBUGP (("implicit perms %0o; ", cur.perms));
+ }
else
{
- cur.perms = symperms (tok + 1);
- DEBUGP (("perms %0o; ", cur.perms));
- }
+ cur.perms = symperms (tok + 1);
+ DEBUGP (("perms %0o; ", cur.perms));
+ }
error = ignore = 0; /* Erroneous and ignoring entries are
- treated equally for now. */
+ treated equally for now. */
year = hour = min = sec = 0; /* Silence the compiler. */
month = day = 0;
next = -1;
/* While there are tokens on the line, parse them. Next is the
- number of tokens left until the filename.
+ number of tokens left until the filename.
- Use the month-name token as the "anchor" (the place where the
- position wrt the file name is "known"). When a month name is
- encountered, `next' is set to 5. Also, the preceding
- characters are parsed to get the file size.
+ Use the month-name token as the "anchor" (the place where the
+ position wrt the file name is "known"). When a month name is
+ encountered, `next' is set to 5. Also, the preceding
+ characters are parsed to get the file size.
- This tactic is quite dubious when it comes to
- internationalization issues (non-English month names), but it
- works for now. */
+ This tactic is quite dubious when it comes to
+ internationalization issues (non-English month names), but it
+ works for now. */
tok = line;
while (ptok = tok,
- (tok = strtok (NULL, " ")) != NULL)
- {
- --next;
- if (next < 0) /* a month name was not encountered */
- {
- for (i = 0; i < 12; i++)
- if (!strcmp (tok, months[i]))
- break;
- /* If we got a month, it means the token before it is the
- size, and the filename is three tokens away. */
- if (i != 12)
- {
- wgint size;
-
- /* Parse the previous token with str_to_wgint. */
- if (ptok == line)
- {
- /* Something has gone wrong during parsing. */
- error = 1;
- break;
- }
- errno = 0;
- size = str_to_wgint (ptok, NULL, 10);
- if (size == WGINT_MAX && errno == ERANGE)
- /* Out of range -- ignore the size. #### Should
- we refuse to start the download. */
- cur.size = 0;
- else
- cur.size = size;
- DEBUGP (("size: %s; ", number_to_static_string(cur.size)));
-
- month = i;
- next = 5;
- DEBUGP (("month: %s; ", months[month]));
- }
- }
- else if (next == 4) /* days */
- {
- if (tok[1]) /* two-digit... */
- day = 10 * (*tok - '0') + tok[1] - '0';
- else /* ...or one-digit */
- day = *tok - '0';
- DEBUGP (("day: %d; ", day));
- }
- else if (next == 3)
- {
- /* This ought to be either the time, or the year. Let's
- be flexible!
-
- If we have a number x, it's a year. If we have x:y,
- it's hours and minutes. If we have x:y:z, z are
- seconds. */
- year = 0;
- min = hour = sec = 0;
- /* We must deal with digits. */
- if (ISDIGIT (*tok))
- {
- /* Suppose it's year. */
- for (; ISDIGIT (*tok); tok++)
- year = (*tok - '0') + 10 * year;
- if (*tok == ':')
- {
- /* This means these were hours! */
- hour = year;
- year = 0;
- ++tok;
- /* Get the minutes... */
- for (; ISDIGIT (*tok); tok++)
- min = (*tok - '0') + 10 * min;
- if (*tok == ':')
- {
- /* ...and the seconds. */
- ++tok;
- for (; ISDIGIT (*tok); tok++)
- sec = (*tok - '0') + 10 * sec;
- }
- }
- }
- if (year)
- DEBUGP (("year: %d (no tm); ", year));
- else
- DEBUGP (("time: %02d:%02d:%02d (no yr); ", hour, min, sec));
- }
- else if (next == 2) /* The file name */
- {
- int fnlen;
- char *p;
-
- /* Since the file name may contain a SPC, it is possible
- for strtok to handle it wrong. */
- fnlen = strlen (tok);
- if (fnlen < len - (tok - line))
- {
- /* So we have a SPC in the file name. Restore the
- original. */
- tok[fnlen] = ' ';
- /* If the file is a symbolic link, it should have a
- ` -> ' somewhere. */
- if (cur.type == FT_SYMLINK)
- {
- p = strstr (tok, " -> ");
- if (!p)
- {
- error = 1;
- break;
- }
- cur.linkto = xstrdup (p + 4);
- DEBUGP (("link to: %s\n", cur.linkto));
- /* And separate it from the file name. */
- *p = '\0';
- }
- }
- /* If we have the filename, add it to the list of files or
- directories. */
- /* "." and ".." are an exception! */
- if (!strcmp (tok, ".") || !strcmp (tok, ".."))
- {
- DEBUGP (("\nIgnoring `.' and `..'; "));
- ignore = 1;
- break;
- }
- /* Some FTP sites choose to have ls -F as their default
- LIST output, which marks the symlinks with a trailing
- `@', directory names with a trailing `/' and
- executables with a trailing `*'. This is no problem
- unless encountering a symbolic link ending with `@',
- or an executable ending with `*' on a server without
- default -F output. I believe these cases are very
- rare. */
- fnlen = strlen (tok); /* re-calculate `fnlen' */
- cur.name = xmalloc (fnlen + 1);
- memcpy (cur.name, tok, fnlen + 1);
- if (fnlen)
- {
- if (cur.type == FT_DIRECTORY && cur.name[fnlen - 1] == '/')
- {
- cur.name[fnlen - 1] = '\0';
- DEBUGP (("trailing `/' on dir.\n"));
- }
- else if (cur.type == FT_SYMLINK && cur.name[fnlen - 1] == '@')
- {
- cur.name[fnlen - 1] = '\0';
- DEBUGP (("trailing `@' on link.\n"));
- }
- else if (cur.type == FT_PLAINFILE
- && (cur.perms & 0111)
- && cur.name[fnlen - 1] == '*')
- {
- cur.name[fnlen - 1] = '\0';
- DEBUGP (("trailing `*' on exec.\n"));
- }
- } /* if (fnlen) */
- else
- error = 1;
- break;
- }
- else
- abort ();
- } /* while */
+ (tok = strtok (NULL, " ")) != NULL)
+ {
+ --next;
+ if (next < 0) /* a month name was not encountered */
+ {
+ for (i = 0; i < 12; i++)
+ if (!strcmp (tok, months[i]))
+ break;
+ /* If we got a month, it means the token before it is the
+ size, and the filename is three tokens away. */
+ if (i != 12)
+ {
+ wgint size;
+
+ /* Parse the previous token with str_to_wgint. */
+ if (ptok == line)
+ {
+ /* Something has gone wrong during parsing. */
+ error = 1;
+ break;
+ }
+ errno = 0;
+ size = str_to_wgint (ptok, NULL, 10);
+ if (size == WGINT_MAX && errno == ERANGE)
+ /* Out of range -- ignore the size. #### Should
+ we refuse to start the download. */
+ cur.size = 0;
+ else
+ cur.size = size;
+ DEBUGP (("size: %s; ", number_to_static_string(cur.size)));
+
+ month = i;
+ next = 5;
+ DEBUGP (("month: %s; ", months[month]));
+ }
+ }
+ else if (next == 4) /* days */
+ {
+ if (tok[1]) /* two-digit... */
+ day = 10 * (*tok - '0') + tok[1] - '0';
+ else /* ...or one-digit */
+ day = *tok - '0';
+ DEBUGP (("day: %d; ", day));
+ }
+ else if (next == 3)
+ {
+ /* This ought to be either the time, or the year. Let's
+ be flexible!
+
+ If we have a number x, it's a year. If we have x:y,
+ it's hours and minutes. If we have x:y:z, z are
+ seconds. */
+ year = 0;
+ min = hour = sec = 0;
+ /* We must deal with digits. */
+ if (c_isdigit (*tok))
+ {
+ /* Suppose it's year. */
+ for (; c_isdigit (*tok); tok++)
+ year = (*tok - '0') + 10 * year;
+ if (*tok == ':')
+ {
+ /* This means these were hours! */
+ hour = year;
+ year = 0;
+ ++tok;
+ /* Get the minutes... */
+ for (; c_isdigit (*tok); tok++)
+ min = (*tok - '0') + 10 * min;
+ if (*tok == ':')
+ {
+ /* ...and the seconds. */
+ ++tok;
+ for (; c_isdigit (*tok); tok++)
+ sec = (*tok - '0') + 10 * sec;
+ }
+ }
+ }
+ if (year)
+ DEBUGP (("year: %d (no tm); ", year));
+ else
+ DEBUGP (("time: %02d:%02d:%02d (no yr); ", hour, min, sec));
+ }
+ else if (next == 2) /* The file name */
+ {
+ int fnlen;
+ char *p;
+
+ /* Since the file name may contain a SPC, it is possible
+ for strtok to handle it wrong. */
+ fnlen = strlen (tok);
+ if (fnlen < len - (tok - line))
+ {
+ /* So we have a SPC in the file name. Restore the
+ original. */
+ tok[fnlen] = ' ';
+ /* If the file is a symbolic link, it should have a
+ ` -> ' somewhere. */
+ if (cur.type == FT_SYMLINK)
+ {
+ p = strstr (tok, " -> ");
+ if (!p)
+ {
+ error = 1;
+ break;
+ }
+ cur.linkto = xstrdup (p + 4);
+ DEBUGP (("link to: %s\n", cur.linkto));
+ /* And separate it from the file name. */
+ *p = '\0';
+ }
+ }
+ /* If we have the filename, add it to the list of files or
+ directories. */
+ /* "." and ".." are an exception! */
+ if (!strcmp (tok, ".") || !strcmp (tok, ".."))
+ {
+ DEBUGP (("\nIgnoring `.' and `..'; "));
+ ignore = 1;
+ break;
+ }
+ /* Some FTP sites choose to have ls -F as their default
+ LIST output, which marks the symlinks with a trailing
+ `@', directory names with a trailing `/' and
+ executables with a trailing `*'. This is no problem
+ unless encountering a symbolic link ending with `@',
+ or an executable ending with `*' on a server without
+ default -F output. I believe these cases are very
+ rare. */
+ fnlen = strlen (tok); /* re-calculate `fnlen' */
+ cur.name = xmalloc (fnlen + 1);
+ memcpy (cur.name, tok, fnlen + 1);
+ if (fnlen)
+ {
+ if (cur.type == FT_DIRECTORY && cur.name[fnlen - 1] == '/')
+ {
+ cur.name[fnlen - 1] = '\0';
+ DEBUGP (("trailing `/' on dir.\n"));
+ }
+ else if (cur.type == FT_SYMLINK && cur.name[fnlen - 1] == '@')
+ {
+ cur.name[fnlen - 1] = '\0';
+ DEBUGP (("trailing `@' on link.\n"));
+ }
+ else if (cur.type == FT_PLAINFILE
+ && (cur.perms & 0111)
+ && cur.name[fnlen - 1] == '*')
+ {
+ cur.name[fnlen - 1] = '\0';
+ DEBUGP (("trailing `*' on exec.\n"));
+ }
+ } /* if (fnlen) */
+ else
+ error = 1;
+ break;
+ }
+ else
+ abort ();
+ } /* while */
if (!cur.name || (cur.type == FT_SYMLINK && !cur.linkto))
- error = 1;
+ error = 1;
DEBUGP (("%s\n", cur.name ? cur.name : ""));
if (error || ignore)
- {
- DEBUGP (("Skipping.\n"));
- xfree_null (cur.name);
- xfree_null (cur.linkto);
- xfree (line);
- continue;
- }
+ {
+ DEBUGP (("Skipping.\n"));
+ xfree_null (cur.name);
+ xfree_null (cur.linkto);
+ xfree (line);
+ continue;
+ }
if (!dir)
- {
- l = dir = xnew (struct fileinfo);
- memcpy (l, &cur, sizeof (cur));
- l->prev = l->next = NULL;
- }
+ {
+ l = dir = xnew (struct fileinfo);
+ memcpy (l, &cur, sizeof (cur));
+ l->prev = l->next = NULL;
+ }
else
- {
- cur.prev = l;
- l->next = xnew (struct fileinfo);
- l = l->next;
- memcpy (l, &cur, sizeof (cur));
- l->next = NULL;
- }
+ {
+ cur.prev = l;
+ l->next = xnew (struct fileinfo);
+ l = l->next;
+ memcpy (l, &cur, sizeof (cur));
+ l->next = NULL;
+ }
/* Get the current time. */
timenow = time (NULL);
tnow = localtime (&timenow);
timestruct.tm_mday = day;
timestruct.tm_mon = month;
if (year == 0)
- {
- /* Some listings will not specify the year if it is "obvious"
- that the file was from the previous year. E.g. if today
- is 97-01-12, and you see a file of Dec 15th, its year is
- 1996, not 1997. Thanks to Vladimir Volovich for
- mentioning this! */
- if (month > tnow->tm_mon)
- timestruct.tm_year = tnow->tm_year - 1;
- else
- timestruct.tm_year = tnow->tm_year;
- }
+ {
+ /* Some listings will not specify the year if it is "obvious"
+ that the file was from the previous year. E.g. if today
+ is 97-01-12, and you see a file of Dec 15th, its year is
+ 1996, not 1997. Thanks to Vladimir Volovich for
+ mentioning this! */
+ if (month > tnow->tm_mon)
+ timestruct.tm_year = tnow->tm_year - 1;
+ else
+ timestruct.tm_year = tnow->tm_year;
+ }
else
- timestruct.tm_year = year;
+ timestruct.tm_year = year;
if (timestruct.tm_year >= 1900)
- timestruct.tm_year -= 1900;
+ timestruct.tm_year -= 1900;
timestruct.tm_wday = 0;
timestruct.tm_yday = 0;
timestruct.tm_isdst = -1;
DEBUGP(("Name: '%s'\n", cur.name));
/* First column: mm-dd-yy. Should atoi() on the month fail, january
- will be assumed. */
+ will be assumed. */
tok = strtok(line, "-");
if (tok == NULL) continue;
month = atoi(tok) - 1;
while ((tok != NULL) && (*tok == '\0')) tok = strtok(NULL, " ");
if (tok == NULL) continue;
if (*tok == '<')
- {
- cur.type = FT_DIRECTORY;
- cur.size = 0;
- cur.perms = 0755;
- DEBUGP(("Directory\n"));
- }
+ {
+ cur.type = FT_DIRECTORY;
+ cur.size = 0;
+ cur.perms = 0755;
+ DEBUGP(("Directory\n"));
+ }
else
- {
- wgint size;
- cur.type = FT_PLAINFILE;
- errno = 0;
- size = str_to_wgint (tok, NULL, 10);
- if (size == WGINT_MAX && errno == ERANGE)
- cur.size = 0; /* overflow */
- else
- cur.size = size;
- cur.perms = 0644;
- DEBUGP(("File, size %s bytes\n", number_to_static_string (cur.size)));
- }
+ {
+ wgint size;
+ cur.type = FT_PLAINFILE;
+ errno = 0;
+ size = str_to_wgint (tok, NULL, 10);
+ if (size == WGINT_MAX && errno == ERANGE)
+ cur.size = 0; /* overflow */
+ else
+ cur.size = size;
+ cur.perms = 0644;
+ DEBUGP(("File, size %s bytes\n", number_to_static_string (cur.size)));
+ }
cur.linkto = NULL;
/* And put everything into the linked list */
if (!dir)
- {
- l = dir = xnew (struct fileinfo);
- memcpy (l, &cur, sizeof (cur));
- l->prev = l->next = NULL;
- }
+ {
+ l = dir = xnew (struct fileinfo);
+ memcpy (l, &cur, sizeof (cur));
+ l->prev = l->next = NULL;
+ }
else
- {
- cur.prev = l;
- l->next = xnew (struct fileinfo);
- l = l->next;
- memcpy (l, &cur, sizeof (cur));
- l->next = NULL;
- }
+ {
+ cur.prev = l;
+ l->next = xnew (struct fileinfo);
+ l = l->next;
+ memcpy (l, &cur, sizeof (cur));
+ l->next = NULL;
+ }
xfree (line);
}
int hour, min, sec;
struct tm timestruct;
- char *line, *tok; /* tokenizer */
+ char *line, *tok; /* tokenizer */
struct fileinfo *dir, *l, cur; /* list creation */
fp = fopen (file, "rb");
char *p;
i = clean_line (line);
if (!i)
- {
- xfree (line);
- break;
- }
+ {
+ xfree (line);
+ break;
+ }
/* First column: Name. A bit of black magic again. The name my be
either ABCD.EXT or ABCD.EXT;NUM and it might be on a separate
if (tok == NULL) tok = line;
DEBUGP(("file name: '%s'\n", tok));
for (p = tok ; *p && *p != ';' ; p++)
- ;
+ ;
if (*p == ';') *p = '\0';
p = tok + strlen(tok) - 4;
if (!strcmp(p, ".DIR")) *p = '\0';
if (!i)
{
DEBUGP(("confusing VMS listing item, leaving listing parser\n"));
- xfree (line);
+ xfree (line);
break;
}
tok = strtok(line, " ");
the first strtok(NULL, "-") will return everything until the end
of the line and only the next strtok() call will return NULL. */
DEBUGP(("nonsense in VMS listing, skipping this line\n"));
- xfree (line);
+ xfree (line);
break;
}
for (i=0; i<12; i++) if (!strcmp(tok,months[i])) break;
p = tok;
hour = atoi (p);
for (; *p && *p != ':'; ++p)
- ;
+ ;
if (*p)
- min = atoi (++p);
+ min = atoi (++p);
for (; *p && *p != ':'; ++p)
- ;
+ ;
if (*p)
- sec = atoi (++p);
+ sec = atoi (++p);
DEBUGP(("YYYY/MM/DD HH:MM:SS - %d/%02d/%02d %02d:%02d:%02d\n",
year+1900, month, day, hour, min, sec));
if (tok == NULL)
{
DEBUGP(("confusing VMS permissions, skipping line\n"));
- xfree (line);
+ xfree (line);
continue;
}
/* Permissons have the format "RWED,RWED,RE" */
return ftp_parse_unix_ls (file, 0);
case ST_WINNT:
{
- /* Detect whether the listing is simulating the UNIX format */
- FILE *fp;
- int c;
- fp = fopen (file, "rb");
- if (!fp)
- {
- logprintf (LOG_NOTQUIET, "%s: %s\n", file, strerror (errno));
- return NULL;
+ /* Detect whether the listing is simulating the UNIX format */
+ FILE *fp;
+ int c;
+ fp = fopen (file, "rb");
+ if (!fp)
+ {
+ logprintf (LOG_NOTQUIET, "%s: %s\n", file, strerror (errno));
+ return NULL;
}
- c = fgetc(fp);
- fclose(fp);
- /* If the first character of the file is '0'-'9', it's WINNT
- format. */
- if (c >= '0' && c <='9')
- return ftp_parse_winnt_ls (file);
+ c = fgetc(fp);
+ fclose(fp);
+ /* If the first character of the file is '0'-'9', it's WINNT
+ format. */
+ if (c >= '0' && c <='9')
+ return ftp_parse_winnt_ls (file);
else
return ftp_parse_unix_ls (file, 1);
}
{
FILE *fp;
char *upwd;
- char *htclfile; /* HTML-clean file name */
+ char *htcldir; /* HTML-clean dir name */
+ char *htclfile; /* HTML-clean file name */
+ char *urlclfile; /* URL-clean file name */
if (!output_stream)
{
fp = fopen (file, "wb");
if (!fp)
- {
- logprintf (LOG_NOTQUIET, "%s: %s\n", file, strerror (errno));
- return FOPENERR;
- }
+ {
+ logprintf (LOG_NOTQUIET, "%s: %s\n", file, strerror (errno));
+ return FOPENERR;
+ }
}
else
fp = output_stream;
tmpu = url_escape (u->user);
tmpp = u->passwd ? url_escape (u->passwd) : NULL;
if (tmpp)
- upwd = concat_strings (tmpu, ":", tmpp, "@", (char *) 0);
+ upwd = concat_strings (tmpu, ":", tmpp, "@", (char *) 0);
else
- upwd = concat_strings (tmpu, "@", (char *) 0);
+ upwd = concat_strings (tmpu, "@", (char *) 0);
xfree (tmpu);
xfree_null (tmpp);
}
else
upwd = xstrdup ("");
+
+ htcldir = html_quote_string (u->dir);
+
fprintf (fp, "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n");
fprintf (fp, "<html>\n<head>\n<title>");
- fprintf (fp, _("Index of /%s on %s:%d"), u->dir, u->host, u->port);
+ fprintf (fp, _("Index of /%s on %s:%d"), htcldir, u->host, u->port);
fprintf (fp, "</title>\n</head>\n<body>\n<h1>");
- fprintf (fp, _("Index of /%s on %s:%d"), u->dir, u->host, u->port);
+ fprintf (fp, _("Index of /%s on %s:%d"), htcldir, u->host, u->port);
fprintf (fp, "</h1>\n<hr>\n<pre>\n");
+
while (f)
{
fprintf (fp, " ");
if (f->tstamp != -1)
- {
- /* #### Should we translate the months? Or, even better, use
- ISO 8601 dates? */
- static const char *months[] = {
- "Jan", "Feb", "Mar", "Apr", "May", "Jun",
- "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
- };
- struct tm *ptm = localtime ((time_t *)&f->tstamp);
-
- fprintf (fp, "%d %s %02d ", ptm->tm_year + 1900, months[ptm->tm_mon],
- ptm->tm_mday);
- if (ptm->tm_hour)
- fprintf (fp, "%02d:%02d ", ptm->tm_hour, ptm->tm_min);
- else
- fprintf (fp, " ");
- }
+ {
+ /* #### Should we translate the months? Or, even better, use
+ ISO 8601 dates? */
+ static const char *months[] = {
+ "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"
+ };
+ time_t tstamp = f->tstamp;
+ struct tm *ptm = localtime (&tstamp);
+
+ fprintf (fp, "%d %s %02d ", ptm->tm_year + 1900, months[ptm->tm_mon],
+ ptm->tm_mday);
+ if (ptm->tm_hour)
+ fprintf (fp, "%02d:%02d ", ptm->tm_hour, ptm->tm_min);
+ else
+ fprintf (fp, " ");
+ }
else
- fprintf (fp, _("time unknown "));
+ fprintf (fp, _("time unknown "));
switch (f->type)
- {
- case FT_PLAINFILE:
- fprintf (fp, _("File "));
- break;
- case FT_DIRECTORY:
- fprintf (fp, _("Directory "));
- break;
- case FT_SYMLINK:
- fprintf (fp, _("Link "));
- break;
- default:
- fprintf (fp, _("Not sure "));
- break;
- }
+ {
+ case FT_PLAINFILE:
+ fprintf (fp, _("File "));
+ break;
+ case FT_DIRECTORY:
+ fprintf (fp, _("Directory "));
+ break;
+ case FT_SYMLINK:
+ fprintf (fp, _("Link "));
+ break;
+ default:
+ fprintf (fp, _("Not sure "));
+ break;
+ }
htclfile = html_quote_string (f->name);
+ urlclfile = url_escape_unsafe_and_reserved (f->name);
fprintf (fp, "<a href=\"ftp://%s%s:%d", upwd, u->host, u->port);
if (*u->dir != '/')
- putc ('/', fp);
- fprintf (fp, "%s", u->dir);
+ putc ('/', fp);
+ /* 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", htclfile);
+ putc ('/', fp);
+ fprintf (fp, "%s", urlclfile);
if (f->type == FT_DIRECTORY)
- putc ('/', fp);
+ putc ('/', fp);
fprintf (fp, "\">%s", htclfile);
if (f->type == FT_DIRECTORY)
- putc ('/', fp);
+ putc ('/', fp);
fprintf (fp, "</a> ");
if (f->type == FT_PLAINFILE)
- fprintf (fp, _(" (%s bytes)"), number_to_static_string (f->size));
+ fprintf (fp, _(" (%s bytes)"), number_to_static_string (f->size));
else if (f->type == FT_SYMLINK)
- fprintf (fp, "-> %s", f->linkto ? f->linkto : "(nil)");
+ fprintf (fp, "-> %s", f->linkto ? f->linkto : "(nil)");
putc ('\n', fp);
xfree (htclfile);
+ xfree (urlclfile);
f = f->next;
}
fprintf (fp, "</pre>\n</body>\n</html>\n");
+ xfree (htcldir);
xfree (upwd);
if (!output_stream)
fclose (fp);