[svn] Remove K&R support.

[wget] / src / recur.c

diff --git a/src/recur.c b/src/recur.c
index af2cbc81fdedb8f344c66b9bad807691abcc3233..a00b47aa5db00574ba5157718422a41ee4195a2f 100644 (file)
--- a/src/recur.c
+++ b/src/recur.c
@@ -31,17 +31,12 @@ so, delete this exception statement from your version.  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif /* HAVE_STRING_H */
+#include <string.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <errno.h>
 #include <assert.h>
-#include <sys/types.h>
 
 #include "wget.h"
 #include "url.h"
@@ -54,10 +49,6 @@ so, delete this exception statement from your version.  */
 #include "res.h"
 #include "convert.h"
 
-#ifndef errno
-extern int errno;
-#endif
-
 extern char *version_string;
 extern LARGE_INT total_downloaded_bytes;
 
@@ -160,10 +151,10 @@ url_dequeue (struct url_queue *queue,
   return 1;
 }
 \f
-static int download_child_p PARAMS ((const struct urlpos *, struct url *, int,
-                                    struct url *, struct hash_table *));
-static int descend_redirect_p PARAMS ((const char *, const char *, int,
-                                      struct url *, struct hash_table *));
+static int download_child_p (const struct urlpos *, struct url *, int,
+                            struct url *, struct hash_table *);
+static int descend_redirect_p (const char *, const char *, int,
+                              struct url *, struct hash_table *);
 
 
 /* Retrieve a part of the web beginning with START_URL.  This used to
@@ -516,13 +507,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))
        {