[svn] Indentation change.

[wget] / src / recur.c

diff --git a/src/recur.c b/src/recur.c
index 1d6a6988934886f4753c46e2bdc1f9f5cfe1a5b9..a77ff39131b0c9a8131a9ecb4be6169e22fa31d5 100644 (file)
--- a/src/recur.c
+++ b/src/recur.c
@@ -448,7 +448,7 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
   /* 1. Schemes other than HTTP are normally not recursed into. */
   if (u->scheme != SCHEME_HTTP
 #ifdef HAVE_SSL
-               && u->scheme != SCHEME_HTTPS
+      && u->scheme != SCHEME_HTTPS
 #endif
       && !(u->scheme == SCHEME_FTP && opt.follow_ftp))
     {
@@ -460,9 +460,9 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
      out.  */
   if (u->scheme == SCHEME_HTTP
 #ifdef HAVE_SSL
-                 || u->scheme == SCHEME_HTTPS
+      || u->scheme == SCHEME_HTTPS
 #endif
-        )
+      )
     if (opt.relative_only && !upos->link_relative_p)
       {
        DEBUGP (("It doesn't really look like a relative link.\n"));
@@ -508,35 +508,22 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
        }
     }
 
-  /* 6. */
-  {
-    /* Check for acceptance/rejection rules.  We ignore these rules
-       for HTML documents because they might lead to other files which
-       need to be downloaded.  Of course, we don't know which
-       documents are HTML before downloading them, so we guess.
-
-       A file is subject to acceptance/rejection rules if:
-
-       * u->file is not "" (i.e. it is not a directory)
-       and either:
-         + there is no file suffix,
-        + or there is a suffix, but is not "html" or "htm" or similar,
-        + both:
-          - recursion is not infinite,
-          - and we are at its very end. */
-
-    if (u->file[0] != '\0'
-       && (!has_html_suffix_p (url)
-           || (opt.reclevel != INFINITE_RECURSION && depth >= opt.reclevel)))
-      {
-       if (!acceptable (u->file))
-         {
-           DEBUGP (("%s (%s) does not match acc/rej rules.\n",
-                    url, u->file));
-           goto out;
-         }
-      }
-  }
+  /* 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.  */
+  if (u->file[0] != '\0'
+      && !(has_html_suffix_p (u->file)
+          && depth != INFINITE_RECURSION
+          && depth < opt.reclevel - 1))
+    {
+      if (!acceptable (u->file))
+       {
+         DEBUGP (("%s (%s) does not match acc/rej rules.\n",
+                  url, u->file));
+         goto out;
+       }
+    }
 
   /* 7. */
   if (u->scheme == parent->scheme)
@@ -548,12 +535,13 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
       }
 
   /* 8. */
-  if (opt.use_robots && (u->scheme == SCHEME_HTTP
+  if (opt.use_robots
+      && (u->scheme == SCHEME_HTTP
 #ifdef HAVE_SSL
-                         || u->scheme == SCHEME_HTTPS
+         || u->scheme == SCHEME_HTTPS
 #endif
-                         )
-        )
+         )
+      )
     {
       struct robot_specs *specs = res_get_specs (u->host, u->port);
       if (!specs)