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

[wget] / src / res.h

diff --git a/src/res.h b/src/res.h
index 97b8977835894bd37e120228f85a9e0657d0a850..a05067768d0304d3b469122cedbbd25075b8f24f 100644 (file)
--- a/src/res.h
+++ b/src/res.h
@@ -5,7 +5,7 @@ This file is part of Wget.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This program 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.
 
 This program is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,


@@ -14,18 +14,35 @@ 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 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 RES_H
+#define RES_H

 
 struct robot_specs;
 
 
 struct robot_specs;
 

-struct robot_specs *res_parse PARAMS ((const char *, int));
-struct robot_specs *res_parse_from_file PARAMS ((const char *));
+struct robot_specs *res_parse (const char *, int);
+struct robot_specs *res_parse_from_file (const char *);
+
+bool res_match_path (const struct robot_specs *, const char *);
+
+void res_register_specs (const char *, int, struct robot_specs *);
+struct robot_specs *res_get_specs (const char *, int);

 
 

-int res_match_path PARAMS ((const struct robot_specs *, const char *));
+bool res_retrieve_file (const char *, char **);

 
 

-void res_register_specs PARAMS ((const char *, int, struct robot_specs *));
-struct robot_specs *res_get_specs PARAMS ((const char *, int));
+bool is_robots_txt_url (const char *);

 
 

-int res_retrieve_file PARAMS ((const char *, char **));
+void res_cleanup (void);

 
 

+#endif /* RES_H */