[mq]: cfg-mk

[wget] / src / html-url.c

diff --git a/src/html-url.c b/src/html-url.c
index c6e758f8e0ad495a83e255065cd06a7166b0e2f4..f938c80c2b81685c8ef2cac374d3c61cfae53c41 100644 (file)
--- a/src/html-url.c
+++ b/src/html-url.c
@@ -1,6 +1,6 @@
 /* Collect URLs from HTML source.
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008 Free Software Foundation, Inc.
+   2007, 2008, 2009 Free Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
@@ -305,10 +305,10 @@ append_url (const char *link_uri, int position, int size,
       char *complete_uri = uri_merge (base, link_uri);
 
       DEBUGP (("%s: merge(%s, %s) -> %s\n",
-               quotearg_n_style (0, locale_quoting_style, ctx->document_file),
+               quotearg_n_style (0, escape_quoting_style, ctx->document_file),
                quote_n (1, base),
                quote_n (2, link_uri),
-               quotearg_n_style (3, locale_quoting_style, complete_uri)));
+               quotearg_n_style (3, escape_quoting_style, complete_uri)));
 
       url = url_parse (complete_uri, NULL, NULL, false);
       if (!url)
@@ -590,15 +590,25 @@ tag_handle_meta (int tagid, struct taginfo *tag, struct map_context *ctx)
         {
           while (*content)
             {
-              /* Find the next occurrence of ',' or the end of
-                 the string.  */
-              char *end = strchr (content, ',');
-              if (end)
-                ++end;
-              else
-                end = content + strlen (content);
+              char *end;
+              /* Skip any initial whitespace. */
+              content += strspn (content, " \f\n\r\t\v");
+              /* Find the next occurrence of ',' or whitespace,
+               * or the end of the string.  */
+              end = content + strcspn (content, ", \f\n\r\t\v");
               if (!strncasecmp (content, "nofollow", end - content))
                 ctx->nofollow = true;
+              /* Skip past the next comma, if any. */
+              if (*end == ',')
+                ++end;
+              else
+                {
+                  end = strchr (end, ',');
+                  if (end)
+                    ++end;
+                  else
+                    end = content + strlen (content);
+                }
               content = end;
             }
         }
@@ -615,7 +625,7 @@ collect_tags_mapper (struct taginfo *tag, void *arg)
 
   /* Find the tag in our table of tags.  This must not fail because
      map_html_tags only returns tags found in interesting_tags.
-     
+
      I've changed this for now, I'm passing NULL as interesting_tags
      to map_html_tags.  This way we can check all tags for a style
      attribute.