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

[wget] / src / html-parse.h

diff --git a/src/html-parse.h b/src/html-parse.h
index 5810a2af8582bc98e6fad8a46ff9f9ca6c0841d3..cfec60b569425d339f447e7a1ad77cf93266b8a2 100644 (file)
--- a/src/html-parse.h
+++ b/src/html-parse.h
@@ -1,21 +1,33 @@
 /* Declarations for html-parse.c.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998-2006 Free Software Foundation, Inc.
 
-This file is part of Wget.
+This file is part of GNU Wget.
 
-This program is free software; you can redistribute it and/or modify
+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.
 
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 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 this program; 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
+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.  */
+
+#ifndef HTML_PARSE_H
+#define HTML_PARSE_H
 
 struct attr_pair {
   char *name;                  /* attribute name */
@@ -40,5 +52,15 @@ struct taginfo {
   const char *end_position;    /* end position of tag */
 };
 
-void map_html_tags PARAMS ((const char *, int, const char **, const char **,
-                           void (*) (struct taginfo *, void *), void *));
+struct hash_table;             /* forward declaration */
+
+/* Flags for map_html_tags: */
+#define MHT_STRICT_COMMENTS  1  /* use strict comment interpretation */
+#define MHT_TRIM_VALUES      2  /* trim attribute values, e.g. interpret
+                                   <a href=" foo "> as "foo" */
+
+void map_html_tags (const char *, int,
+                   void (*) (struct taginfo *, void *), void *, int,
+                   const struct hash_table *, const struct hash_table *);
+
+#endif /* HTML_PARSE_H */