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

[svn] Made --spider work with FTP downloads. 

By Aaron S. Hawley.
This commit is contained in:
hniksic 2003-09-30 14:14:02 -07:00
parent 1c01316428
commit b307160959
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ChangeLog
View File

@ -1,3 +1,12 @@
2003-09-29 Aaron Hawley <Aaron.Hawley@uvm.edu>
* ftp.c (getftp): --spider option should now work with FTP
downloads.
(ftp_loop_internal): quiet reports and calculations of downloads
when --spider option set, nor try deleting when --delete-after
also set.
(ftp_loop): --spider will skip HTML-ification of .listing file.
2003-09-26 Gisle Vanem <giva@bgnett.no> 2003-09-26 Gisle Vanem <giva@bgnett.no>
* mswindows.c (read_registry): Removed. * mswindows.c (read_registry): Removed.

18
src/ftp.c
View File

@ -827,6 +827,9 @@ Error in server response, closing control connection.\n"));
expected_bytes = ftp_expected_bytes (ftp_last_respline); expected_bytes = ftp_expected_bytes (ftp_last_respline);
} /* cmd & DO_LIST */ } /* cmd & DO_LIST */
if (!(cmd & (DO_LIST | DO_RETR)) || (opt.spider && !(cmd & DO_LIST)))
return RETRFINISHED;
/* Some FTP servers return the total length of file after REST /* Some FTP servers return the total length of file after REST
command, others just return the remaining size. */ command, others just return the remaining size. */
if (*len && restval && expected_bytes if (*len && restval && expected_bytes
@ -837,9 +840,6 @@ Error in server response, closing control connection.\n"));
} }
/* If no transmission was required, then everything is OK. */ /* If no transmission was required, then everything is OK. */
if (!(cmd & (DO_LIST | DO_RETR)))
return RETRFINISHED;
if (!pasv_mode_open) /* we are not using pasive mode so we need if (!pasv_mode_open) /* we are not using pasive mode so we need
to accept */ to accept */
{ {
@ -1162,7 +1162,8 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
} }
/* Time? */ /* Time? */
tms = time_str (NULL); tms = time_str (NULL);
tmrate = retr_rate (len - restval, con->dltime, 0); if (!opt.spider)
tmrate = retr_rate (len - restval, con->dltime, 0);
/* If we get out of the switch above without continue'ing, we've /* If we get out of the switch above without continue'ing, we've
successfully downloaded a file. Remember this fact. */ successfully downloaded a file. Remember this fact. */
@ -1173,8 +1174,9 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
CLOSE (RBUF_FD (&con->rbuf)); CLOSE (RBUF_FD (&con->rbuf));
rbuf_uninitialize (&con->rbuf); rbuf_uninitialize (&con->rbuf);
} }
logprintf (LOG_VERBOSE, _("%s (%s) - `%s' saved [%ld]\n\n"), if (!opt.spider)
tms, tmrate, locf, len); logprintf (LOG_VERBOSE, _("%s (%s) - `%s' saved [%ld]\n\n"),
tms, tmrate, locf, len);
if (!opt.verbose && !opt.quiet) if (!opt.verbose && !opt.quiet)
{ {
/* Need to hide the password from the URL. The `if' is here /* Need to hide the password from the URL. The `if' is here
@ -1201,7 +1203,7 @@ ftp_loop_internal (struct url *u, struct fileinfo *f, ccon *con)
by the more specific option --dont-remove-listing, and the code by the more specific option --dont-remove-listing, and the code
to do this deletion is in another function. */ to do this deletion is in another function. */
} }
else else if (!opt.spider)
/* This is not a directory listing file. */ /* This is not a directory listing file. */
{ {
/* Unlike directory listing files, don't pretend normal files weren't /* Unlike directory listing files, don't pretend normal files weren't
@ -1727,7 +1729,7 @@ ftp_loop (struct url *u, int *dt, struct url *proxy)
if (res == RETROK) if (res == RETROK)
{ {
if (opt.htmlify) if (opt.htmlify && !opt.spider)
{ {
char *filename = (opt.output_document char *filename = (opt.output_document
? xstrdup (opt.output_document) ? xstrdup (opt.output_document)