From f4f8e83327e1a182e92a57de680fe4ff7b13eae2 Mon Sep 17 00:00:00 2001 From: hniksic Date: Thu, 2 Mar 2000 05:28:31 -0800 Subject: [PATCH] [svn] Applied Edward Sabol's patch. --- src/ChangeLog | 6 ++++++ src/recur.c | 12 +++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 54704959..7b8cae52 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +1998-11-03 Edward J. Sabol + + * recur.c (recursive_retrieve): If a finite maximum depth is + specified, and we're are already at that depth, don't download the + HTML file for parsing. + 2000-03-01 Dan Harkless * ftp.c (ftp_loop_internal): Call new downloaded_file() function, diff --git a/src/recur.c b/src/recur.c index e8a86b0b..8de38061 100644 --- a/src/recur.c +++ b/src/recur.c @@ -221,9 +221,9 @@ recursive_retrieve (const char *file, const char *this_url) Addendum: If the URL is FTP, and it is to be loaded, only the domain and suffix settings are "stronger". - Note that .html and (yuck) .htm will get loaded - regardless of suffix rules (but that is remedied later with - unlink). + Note that .html and (yuck) .htm will get loaded regardless of + suffix rules (but that is remedied later with unlink) unless + the depth equals the maximum depth. More time- and memory- consuming tests should be put later on the list. */ @@ -306,11 +306,13 @@ recursive_retrieve (const char *file, const char *this_url) b) it is "htm" If the file *is* supposed to be HTML, it will *not* be - subject to acc/rej rules. That's why the `!'. */ + subject to acc/rej rules, unless a finite maximum depth has + been specified and the current depth is the maximum depth. */ if (! (!*u->file || (((suf = suffix (constr)) != NULL) - && (!strcmp (suf, "html") || !strcmp (suf, "htm"))))) + && ((!strcmp (suf, "html") || !strcmp (suf, "htm")) + && ((opt.reclevel != 0) && (depth != opt.reclevel)))))) { if (!acceptable (u->file)) {