X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fhtml-url.h;h=5592aad1c61b2bb82d469a3895433c28c5db9270;hb=e095cc064eb72ca0cee6d41622e39e7ea3f211a6;hp=a94f0db6c62abd01f929febd4ca669fda9c365ba;hpb=caae3b70f46bd519857b595f7f06ea0179551336;p=wget
diff --git a/src/html-url.h b/src/html-url.h
index a94f0db6..5592aad1 100644
--- a/src/html-url.h
+++ b/src/html-url.h
@@ -1,12 +1,13 @@
/* Declarations for html-url.c.
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 2009, 2010 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
@@ -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
-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 .
+
+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 HTML_URL_H
#define HTML_URL_H
@@ -39,12 +40,11 @@ struct map_context {
bool nofollow; /* whether NOFOLLOW was specified in a
tag. */
- struct urlpos *head, *tail; /* List of URLs that is being
- built. */
+ struct urlpos *head; /* List of URLs that is being built. */
};
struct urlpos *get_urls_file (const char *);
-struct urlpos *get_urls_html (const char *, const char *, bool *);
+struct urlpos *get_urls_html (const char *, const char *, bool *, struct iri *);
struct urlpos *append_url (const char *, int, int, struct map_context *);
void free_urlpos (struct urlpos *);