[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / html-url.c

diff --git a/src/html-url.c b/src/html-url.c
index 27de1eabb4f1846f6935dfadaed57ed722686b66..3c7c409e82e4c9f48e490abee7f4131a9113da0f 100644 (file)
--- a/src/html-url.c
+++ b/src/html-url.c
@@ -1,11 +1,11 @@
 /* Collect URLs from HTML source.
 /* Collect URLs from HTML source.

-   Copyright (C) 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998-2006 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
 
 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
+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,
  (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,8 +14,7 @@ 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
 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.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -170,8 +169,8 @@ static const char *additional_attributes[] = {
   "action"                     /* used by tag_handle_form */
 };
 
   "action"                     /* used by tag_handle_form */
 };
 

-struct hash_table *interesting_tags;
-struct hash_table *interesting_attributes;
+static struct hash_table *interesting_tags;
+static struct hash_table *interesting_attributes;

 
 static void
 init_interesting (void)
 
 static void
 init_interesting (void)


@@ -701,7 +700,6 @@ get_urls_file (const char *file)
       xfree (url_text);
 
       entry = xnew0 (struct urlpos);
       xfree (url_text);
 
       entry = xnew0 (struct urlpos);

-      entry->next = NULL;

       entry->url = url;
 
       if (!head)
       entry->url = url;
 
       if (!head)