X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fftp-ls.c;h=6613d7d1b7eaeafe9d77bbd9bd33bace8be00e39;hb=2447fb9a9b85083c1e6fa54d0a18bdf3962fab1f;hp=bf613b24938d4374aceca650afd9b06c93a0deaf;hpb=b8789d77988c4cf6359112e4b1340bc6bcb2d0f4;p=wget diff --git a/src/ftp-ls.c b/src/ftp-ls.c index bf613b24..6613d7d1 100644 --- a/src/ftp-ls.c +++ b/src/ftp-ls.c @@ -16,27 +16,35 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Wget; if not, write to the Free Software -Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +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. */ #include #include #include -#ifdef HAVE_STRING_H -# include -#else -# include -#endif +#include #ifdef HAVE_UNISTD_H # include #endif -#include #include +#include #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 */ /* Converts symbolic permissions to number-style ones, e.g. string rwxr-xr-x to 755. For now, it knows nothing of @@ -109,7 +117,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms) dir = l = NULL; /* Line loop to end of file: */ - while ((line = read_whole_line (fp))) + while ((line = read_whole_line (fp)) != NULL) { len = clean_line (line); /* Skip if total... */ @@ -188,7 +196,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms) This tactic is quite dubious when it comes to internationalization issues (non-English month names), but it works for now. */ - while ((tok = strtok (NULL, " "))) + while ((tok = strtok (NULL, " ")) != NULL) { --next; if (next < 0) /* a month name was not encountered */ @@ -200,17 +208,28 @@ ftp_parse_unix_ls (const char *file, int ignore_perms) size, and the filename is three tokens away. */ if (i != 12) { - char *t = tok - 2; - long mul = 1; + wgint size; - for (cur.size = 0; t > line && ISDIGIT (*t); mul *= 10, t--) - cur.size += mul * (*t - '0'); + /* Back up to the beginning of the previous token + and parse it with str_to_wgint. */ + char *t = tok - 2; + while (t > line && ISDIGIT (*t)) + --t; if (t == line) { - /* Something is seriously wrong. */ + /* Something has gone wrong during parsing. */ error = 1; break; } + errno = 0; + size = str_to_wgint (t, 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; + month = i; next = 5; DEBUGP (("month: %s; ", months[month])); @@ -310,7 +329,7 @@ ftp_parse_unix_ls (const char *file, int ignore_perms) default -F output. I believe these cases are very rare. */ fnlen = strlen (tok); /* re-calculate `fnlen' */ - cur.name = (char *)xmalloc (fnlen + 1); + cur.name = xmalloc (fnlen + 1); memcpy (cur.name, tok, fnlen + 1); if (fnlen) { @@ -348,22 +367,22 @@ ftp_parse_unix_ls (const char *file, int ignore_perms) if (error || ignore) { DEBUGP (("Skipping.\n")); - FREE_MAYBE (cur.name); - FREE_MAYBE (cur.linkto); + xfree_null (cur.name); + xfree_null (cur.linkto); xfree (line); continue; } if (!dir) { - l = dir = (struct fileinfo *)xmalloc (sizeof (struct fileinfo)); + l = dir = xnew (struct fileinfo); memcpy (l, &cur, sizeof (cur)); l->prev = l->next = NULL; } else { cur.prev = l; - l->next = (struct fileinfo *)xmalloc (sizeof (struct fileinfo)); + l->next = xnew (struct fileinfo); l = l->next; memcpy (l, &cur, sizeof (cur)); l->next = NULL; @@ -426,7 +445,7 @@ ftp_parse_winnt_ls (const char *file) dir = l = NULL; /* Line loop to end of file: */ - while ((line = read_whole_line (fp))) + while ((line = read_whole_line (fp)) != NULL) { len = clean_line (line); @@ -444,11 +463,14 @@ ftp_parse_winnt_ls (const char *file) /* First column: mm-dd-yy. Should atoi() on the month fail, january will be assumed. */ tok = strtok(line, "-"); + if (tok == NULL) continue; month = atoi(tok) - 1; if (month < 0) month = 0; tok = strtok(NULL, "-"); + if (tok == NULL) continue; day = atoi(tok); tok = strtok(NULL, " "); + if (tok == NULL) continue; year = atoi(tok); /* Assuming the epoch starting at 1.1.1970 */ if (year <= 70) year += 100; @@ -456,8 +478,10 @@ ftp_parse_winnt_ls (const char *file) /* Second column: hh:mm[AP]M, listing does not contain value for seconds */ tok = strtok(NULL, ":"); + if (tok == NULL) continue; hour = atoi(tok); tok = strtok(NULL, "M"); + if (tok == NULL) continue; min = atoi(tok); /* Adjust hour from AM/PM. Just for the record, the sequence goes 11:00AM, 12:00PM, 01:00PM ... 11:00PM, 12:00AM, 01:00AM . */ @@ -487,7 +511,9 @@ ftp_parse_winnt_ls (const char *file) directories as the listing does not give us a clue) and filetype here. */ tok = strtok(NULL, " "); - while (*tok == '\0') tok = strtok(NULL, " "); + if (tok == NULL) continue; + while ((tok != NULL) && (*tok == '\0')) tok = strtok(NULL, " "); + if (tok == NULL) continue; if (*tok == '<') { cur.type = FT_DIRECTORY; @@ -497,10 +523,16 @@ ftp_parse_winnt_ls (const char *file) } else { + wgint size; cur.type = FT_PLAINFILE; - cur.size = atoi(tok); + 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 %ld bytes\n", cur.size)); + DEBUGP(("File, size %s bytes\n", number_to_static_string (cur.size))); } cur.linkto = NULL; @@ -508,20 +540,20 @@ ftp_parse_winnt_ls (const char *file) /* And put everything into the linked list */ if (!dir) { - l = dir = (struct fileinfo *)xmalloc (sizeof (struct fileinfo)); + l = dir = xnew (struct fileinfo); memcpy (l, &cur, sizeof (cur)); l->prev = l->next = NULL; } else { cur.prev = l; - l->next = (struct fileinfo *)xmalloc (sizeof (struct fileinfo)); + l->next = xnew (struct fileinfo); l = l->next; memcpy (l, &cur, sizeof (cur)); l->next = NULL; } - xfree(line); + xfree (line); } fclose(fp); @@ -579,21 +611,18 @@ ftp_parse_vms_ls (const char *file) /* Skip empty line. */ line = read_whole_line (fp); - if (line) - xfree (line); + xfree_null (line); /* Skip "Directory PUB$DEVICE[PUB]" */ line = read_whole_line (fp); - if (line) - xfree (line); + xfree_null (line); /* Skip empty line. */ line = read_whole_line (fp); - if (line) - xfree (line); + xfree_null (line); /* Line loop to end of file: */ - while ((line = read_whole_line (fp))) + while ((line = read_whole_line (fp)) != NULL) { char *p; i = clean_line (line); @@ -668,6 +697,7 @@ ftp_parse_vms_ls (const char *file) /* Third/Second column: Date DD-MMM-YYYY. */ tok = strtok(NULL, "-"); + if (tok == NULL) continue; DEBUGP(("day: '%s'\n",tok)); day = atoi(tok); tok = strtok(NULL, "-"); @@ -685,12 +715,14 @@ ftp_parse_vms_ls (const char *file) /* Uknown months are mapped to January */ month = i % 12 ; tok = strtok (NULL, " "); + if (tok == NULL) continue; year = atoi (tok) - 1900; DEBUGP(("date parsed\n")); /* Fourth/Third column: Time hh:mm[:ss] */ tok = strtok (NULL, " "); - hour = min = sec = 0; + if (tok == NULL) continue; + min = sec = 0; p = tok; hour = atoi (p); for (; *p && *p != ':'; ++p); @@ -720,10 +752,12 @@ ftp_parse_vms_ls (const char *file) /* Skip the fifth column */ tok = strtok(NULL, " "); + if (tok == NULL) continue; /* Sixth column: Permissions */ tok = strtok(NULL, ","); /* Skip the VMS-specific SYSTEM permissons */ + if (tok == NULL) continue; tok = strtok(NULL, ")"); if (tok == NULL) { @@ -740,14 +774,14 @@ ftp_parse_vms_ls (const char *file) /* And put everything into the linked list */ if (!dir) { - l = dir = (struct fileinfo *)xmalloc (sizeof (struct fileinfo)); + l = dir = xnew (struct fileinfo); memcpy (l, &cur, sizeof (cur)); l->prev = l->next = NULL; } else { cur.prev = l; - l->next = (struct fileinfo *)xmalloc (sizeof (struct fileinfo)); + l->next = xnew (struct fileinfo); l = l->next; memcpy (l, &cur, sizeof (cur)); l->next = NULL; @@ -773,7 +807,7 @@ ftp_parse_ls (const char *file, const enum stype system_type) switch (system_type) { case ST_UNIX: - return ftp_parse_unix_ls (file, FALSE); + return ftp_parse_unix_ls (file, 0); case ST_WINNT: { /* Detect whether the listing is simulating the UNIX format */ @@ -792,16 +826,16 @@ ftp_parse_ls (const char *file, const enum stype system_type) if (c >= '0' && c <='9') return ftp_parse_winnt_ls (file); else - return ftp_parse_unix_ls (file, TRUE); + return ftp_parse_unix_ls (file, 1); } case ST_VMS: return ftp_parse_vms_ls (file); case ST_MACOS: - return ftp_parse_unix_ls (file, TRUE); + return ftp_parse_unix_ls (file, 1); default: logprintf (LOG_NOTQUIET, _("\ Unsupported listing type, trying Unix listing parser.\n")); - return ftp_parse_unix_ls (file, FALSE); + return ftp_parse_unix_ls (file, 0); } } @@ -817,7 +851,7 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) char *upwd; char *htclfile; /* HTML-clean file name */ - if (!opt.dfp) + if (!output_stream) { fp = fopen (file, "wb"); if (!fp) @@ -827,18 +861,19 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) } } else - fp = opt.dfp; + fp = output_stream; if (u->user) { char *tmpu, *tmpp; /* temporary, clean user and passwd */ - tmpu = encode_string (u->user); - tmpp = u->passwd ? encode_string (u->passwd) : NULL; - upwd = (char *)xmalloc (strlen (tmpu) - + (tmpp ? (1 + strlen (tmpp)) : 0) + 2); - sprintf (upwd, "%s%s%s@", tmpu, tmpp ? ":" : "", tmpp ? tmpp : ""); + tmpu = url_escape (u->user); + tmpp = u->passwd ? url_escape (u->passwd) : NULL; + if (tmpp) + upwd = concat_strings (tmpu, ":", tmpp, "@", (char *) 0); + else + upwd = concat_strings (tmpu, "@", (char *) 0); xfree (tmpu); - FREE_MAYBE (tmpp); + xfree_null (tmpp); } else upwd = xstrdup (""); @@ -853,8 +888,9 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) fprintf (fp, " "); if (f->tstamp != -1) { - /* #### Should we translate the months? */ - static char *months[] = { + /* #### 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" }; @@ -885,7 +921,7 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) break; } htclfile = html_quote_string (f->name); - fprintf (fp, "host, u->port); + fprintf (fp, "host, u->port); if (*u->dir != '/') putc ('/', fp); fprintf (fp, "%s", u->dir); @@ -899,7 +935,7 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) putc ('/', fp); fprintf (fp, " "); if (f->type == FT_PLAINFILE) - fprintf (fp, _(" (%s bytes)"), legible (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)"); putc ('\n', fp); @@ -908,7 +944,7 @@ ftp_index (const char *file, struct url *u, struct fileinfo *f) } fprintf (fp, "\n\n\n"); xfree (upwd); - if (!opt.dfp) + if (!output_stream) fclose (fp); else fflush (fp);