moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

[svn] Correct logic of check #6 in download_child_p.

Browse Source 
By Larry Jones and Hrvoje Niksic.
This commit is contained in:
hniksic 2005-04-09 15:18:36 -07:00
parent 8b9cabe004
commit b49b6db4f1
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ChangeLog
View File

@ -1,3 +1,15 @@
2005-04-09 Hrvoje Niksic <hniksic@xemacs.org>
* recur.c (download_child_p): When -p is used, (temporarily)
ignore accept/reject rules for HTMLs, even when they are at the
maximum recursion depth. That is because with -p we are, if
necessary, overstepping the max. depth to get the requisites.
2004-06-12 Larry Jones <lawrence.jones@ugsplm.com>
* recur.c (download_child_p): Correct the logic in check number 6:
test opt.reclevel (not DEPTH) against INFINITE_RECURSION.
2005-04-09 Hrvoje Niksic <hniksic@xemacs.org>
* url.c: Use "static const" in preference to "const static".

18
src/recur.c
View File

@ -516,13 +516,21 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
}
/* 6. Check for acceptance/rejection rules. We ignore these rules
for directories (no file name to match) and for HTML documents,
which might lead to other files that do need to be downloaded.
That is, unless we've exhausted the recursion depth anyway. */
for directories (no file name to match) and for non-leaf HTMLs,
which can lead to other files that do need to be downloaded. (-p
automatically implies non-leaf because with -p we can, if
necesary, overstep the maximum depth to get the page requisites.) */
if (u->file[0] != '\0'
&& !(has_html_suffix_p (u->file)
&& depth != INFINITE_RECURSION
&& depth < opt.reclevel - 1))
/* The exception only applies to non-leaf HTMLs (but -p
always implies non-leaf because we can overstep the
maximum depth to get the requisites): */
&& (/* non-leaf */
opt.reclevel == INFINITE_RECURSION
/* also non-leaf */
|| depth < opt.reclevel - 1
/* -p, which implies non-leaf (see above) */
|| opt.page_requisites)))
{
if (!acceptable (u->file))
{