Fix a problem when -k is specified and url's are specified in CSS code.

[wget] / src / css-url.c

diff --git a/src/css-url.c b/src/css-url.c
index 621c17dd65948efa5858ee76bfbd4871c9c53009..ab8d67612ca4e54ed6f90ac5e0cd427dedd275e4 100644 (file)
--- a/src/css-url.c
+++ b/src/css-url.c
@@ -1,5 +1,5 @@
 /* Collect URLs from CSS source.
-   Copyright (C) 1998, 2000, 2001, 2002, 2003, 2009 Free Software
+   Copyright (C) 1998, 2000, 2001, 2002, 2003, 2009, 2010 Free Software
    Foundation, Inc.
 
 This file is part of GNU Wget.
@@ -49,7 +49,6 @@ as that of the covered work.  */
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "wget.h"
 #include "utils.h"
@@ -144,7 +143,7 @@ get_uri_string (const char *at, int *pos, int *length)
   if (uri)
     {
       strncpy (uri, at + *pos, *length);
-      uri[*length] = '\0';      
+      uri[*length] = '\0';
     }
 
   return uri;
@@ -253,7 +252,7 @@ get_urls_css_file (const char *file, const char *url)
   struct map_context ctx;
 
   /* Load the file. */
-  fm = read_file (file);
+  fm = wget_read_file (file);
   if (!fm)
     {
       logprintf (LOG_NOTQUIET, "%s: %s\n", file, strerror (errno));
@@ -262,13 +261,13 @@ get_urls_css_file (const char *file, const char *url)
   DEBUGP (("Loaded %s (size %s).\n", file, number_to_static_string (fm->length)));
 
   ctx.text = fm->content;
-  ctx.head = ctx.tail = NULL;
+  ctx.head = NULL;
   ctx.base = NULL;
   ctx.parent_base = url ? url : opt.base_href;
   ctx.document_file = file;
   ctx.nofollow = 0;
 
   get_urls_css (&ctx, 0, fm->length);
-  read_file_free (fm);
+  wget_read_file_free (fm);
   return ctx.head;
 }