mass change: update copyright years.

[wget] / src / css-url.c

diff --git a/src/css-url.c b/src/css-url.c
index 4ae49a791c8806eba7466038f16a5af686372552..de1caad932a3f3ce77afd619e2a62a090eae466f 100644 (file)
--- a/src/css-url.c
+++ b/src/css-url.c
@@ -1,13 +1,13 @@
 /* Collect URLs from CSS source.
-   Copyright (C) 1998, 2000, 2001, 2002, 2003, 2009 Free Software
-   Foundation, Inc.
+   Copyright (C) 1998, 2000, 2001, 2002, 2003, 2009, 2010, 2011 Free
+   Software Foundation, Inc.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+the Free Software Foundation; either version 3 of the License, or (at
+your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,18 +15,18 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.
+
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
 
 /*
   Note that this is not an actual CSS parser, but just a lexical
@@ -49,7 +49,6 @@ so, delete this exception statement from your version.  */
 #include <stdlib.h>
 #include <ctype.h>
 #include <errno.h>
-#include <assert.h>
 
 #include "wget.h"
 #include "utils.h"
@@ -125,9 +124,11 @@ get_uri_string (const char *at, int *pos, int *length)
   /* skip leading space */
   while (isspace (at[*pos]))
     {
-    (*pos)++;
-    (*length)--;
+      (*pos)++;
+      if (--(*length) == 0)
+        return NULL;
     }
+
   /* skip trailing space */
   while (isspace (at[*pos + *length - 1]))
     {
@@ -144,7 +145,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 +254,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 +263,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;
 }