[svn] Restricted operational semantics of frontcmp and proclist from generic strings...

[wget] / src / recur.c

diff --git a/src/recur.c b/src/recur.c
index 6c182f07012b1b5bab679b57d6b9e38e9944974a..1e277ca37dfa75663a8902926772dc2b5e67e35b 100644 (file)
--- a/src/recur.c
+++ b/src/recur.c
@@ -55,7 +55,7 @@ struct queue_element {
   const char *url;             /* the URL to download */
   const char *referer;         /* the referring document */
   int depth;                   /* the depth */
-  unsigned int html_allowed :1;        /* whether the document is allowed to
+  bool html_allowed;           /* whether the document is allowed to
                                   be treated as HTML. */
 
   struct queue_element *next;  /* next element in queue */
@@ -482,7 +482,7 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
       && u->port == start_url_parsed->port
       && !(opt.page_requisites && upos->link_inline_p))
     {
-      if (!frontcmp (start_url_parsed->dir, u->dir))
+      if (!subdir_p (start_url_parsed->dir, u->dir))
        {
          DEBUGP (("Going to \"%s\" would escape \"%s\" with no_parent on.\n",
                   u->dir, start_url_parsed->dir));
@@ -495,7 +495,7 @@ download_child_p (const struct urlpos *upos, struct url *parent, int depth,
      exclusion and inclusion lists.  */
   if (opt.includes || opt.excludes)
     {
-      if (!accdir (u->dir, ALLABS))
+      if (!accdir (u->dir))
        {
          DEBUGP (("%s (%s) is excluded/not-included.\n", url, u->dir));
          goto out;