mass change: update copyright years.

[wget] / src / convert.h

diff --git a/src/convert.h b/src/convert.h
index fea808cf386ae49e695fd411393120f01f96e940..1f034e57a131cbb05699bd7a13f21a8193379f76 100644 (file)
--- a/src/convert.h
+++ b/src/convert.h
@@ -1,11 +1,12 @@
 /* Declarations for convert.c
 /* Declarations for convert.c

-   Copyright (C) 2003-2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 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
 
 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,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
 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.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 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.  */

 
 #ifndef CONVERT_H
 #define CONVERT_H
 
 #ifndef CONVERT_H
 #define CONVERT_H


@@ -33,6 +34,7 @@ so, delete this exception statement from your version.  */
 struct hash_table;             /* forward decl */
 extern struct hash_table *dl_url_file_map;
 extern struct hash_table *downloaded_html_set;
 struct hash_table;             /* forward decl */
 extern struct hash_table *dl_url_file_map;
 extern struct hash_table *downloaded_html_set;

+extern struct hash_table *downloaded_css_set;

 
 enum convert_options {
   CO_NOCONVERT = 0,            /* don't convert this URL */
 
 enum convert_options {
   CO_NOCONVERT = 0,            /* don't convert this URL */


@@ -64,7 +66,9 @@ struct urlpos {
   unsigned int link_complete_p :1; /* the link was complete (had host name) */
   unsigned int link_base_p     :1; /* the url came from <base href=...> */
   unsigned int link_inline_p   :1; /* needed to render the page */
   unsigned int link_complete_p :1; /* the link was complete (had host name) */
   unsigned int link_base_p     :1; /* the url came from <base href=...> */
   unsigned int link_inline_p   :1; /* needed to render the page */

+  unsigned int link_css_p      :1; /* the url came from CSS */

   unsigned int link_expect_html        :1; /* expected to contain HTML */
   unsigned int link_expect_html        :1; /* expected to contain HTML */

+  unsigned int link_expect_css :1; /* expected to contain CSS */

 
   unsigned int link_refresh_p  :1; /* link was received from
                                       <meta http-equiv=refresh content=...> */
 
   unsigned int link_refresh_p  :1; /* link was received from
                                       <meta http-equiv=refresh content=...> */


@@ -98,6 +102,7 @@ downloaded_file_t downloaded_file (downloaded_file_t, const char *);
 void register_download (const char *, const char *);
 void register_redirection (const char *, const char *);
 void register_html (const char *, const char *);
 void register_download (const char *, const char *);
 void register_redirection (const char *, const char *);
 void register_html (const char *, const char *);

+void register_css (const char *, const char *);

 void register_delete_file (const char *);
 void convert_all_links (void);
 void convert_cleanup (void);
 void register_delete_file (const char *);
 void convert_all_links (void);
 void convert_cleanup (void);