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

[wget] / src / url.h

diff --git a/src/url.h b/src/url.h
index b99c64cef84a9bfe9297d68dbc3c8a915a05e572..f4b6b7e19a13b5eb121a51dcbfab9dad7404e4ec 100644 (file)
--- a/src/url.h
+++ b/src/url.h
@@ -1,11 +1,11 @@
 /* Declarations for url.c.
 /* Declarations for url.c.

-   Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996-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,17 @@ 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
+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 URL_H
 #define URL_H
 
 #ifndef URL_H
 #define URL_H


@@ -61,100 +70,32 @@ struct url
   char *passwd;
 };
 
   char *passwd;
 };
 

-enum convert_options {
-  CO_NOCONVERT = 0,            /* don't convert this URL */
-  CO_CONVERT_TO_RELATIVE,      /* convert to relative, e.g. to
-                                   "../../otherdir/foo.gif" */
-  CO_CONVERT_TO_COMPLETE,      /* convert to absolute, e.g. to
-                                  "http://orighost/somedir/bar.jpg". */
-  CO_NULLIFY_BASE              /* change to empty string. */
-};
-
-/* A structure that defines the whereabouts of a URL, i.e. its
-   position in an HTML document, etc.  */
-
-struct urlpos {
-  struct url *url;             /* the URL of the link, after it has
-                                  been merged with the base */
-  char *local_name;            /* local file to which it was saved
-                                  (used by convert_links) */
-
-  /* reserved for special links such as <base href="..."> which are
-     used when converting links, but ignored when downloading.  */
-  unsigned int ignore_when_downloading :1;
-
-  /* Information about the original link: */
-
-  unsigned int link_relative_p :1; /* was the link relative? */
-  unsigned int link_complete_p :1; /* was the link complete (with the
-                                      host name, etc.) */
-  unsigned int link_base_p     :1; /* was the link <base href=...> */
-  unsigned int link_inline_p   :1; /* needed to render the page. */
-
-  unsigned int link_refresh_p  :1; /* link was received from
-                                      <meta http-equiv=refresh content=...> */
-  int refresh_timeout;         /* for reconstructing the refresh. */
-
-  /* Conversion requirements: */
-  enum convert_options convert;        /* is conversion required? */
-
-  /* URL's position in the buffer. */
-  int pos, size;
-
-  struct urlpos *next;         /* next list element */
-};
-
-/* downloaded_file() takes a parameter of this type and returns this type. */
-typedef enum
-{
-  /* Return enumerators: */
-  FILE_NOT_ALREADY_DOWNLOADED = 0,
-
-  /* Return / parameter enumerators: */
-  FILE_DOWNLOADED_NORMALLY,
-  FILE_DOWNLOADED_AND_HTML_EXTENSION_ADDED,
-
-  /* Parameter enumerators: */
-  CHECK_FOR_FILE
-} downloaded_file_t;
-

 /* Function declarations */
 
 /* Function declarations */
 

-char *encode_string PARAMS ((const char *));
-
-struct url *url_parse PARAMS ((const char *, int *));
-const char *url_error PARAMS ((int));
-char *url_full_path PARAMS ((const struct url *));
-void url_set_dir PARAMS ((struct url *, const char *));
-void url_set_file PARAMS ((struct url *, const char *));
-void url_free PARAMS ((struct url *));
-
-enum url_scheme url_scheme PARAMS ((const char *));
-int url_skip_scheme PARAMS ((const char *));
-int url_has_scheme PARAMS ((const char *));
-int scheme_default_port PARAMS ((enum url_scheme));
-
-int url_skip_uname PARAMS ((const char *));
-
-char *url_string PARAMS ((const struct url *, int));
+char *url_escape (const char *);

 
 

-struct urlpos *get_urls_file PARAMS ((const char *));
-struct urlpos *get_urls_html PARAMS ((const char *, const char *, int *));
-void free_urlpos PARAMS ((struct urlpos *));
+struct url *url_parse (const char *, int *);
+const char *url_error (int);
+char *url_full_path (const struct url *);
+void url_set_dir (struct url *, const char *);
+void url_set_file (struct url *, const char *);
+void url_free (struct url *);

 
 

-char *uri_merge PARAMS ((const char *, const char *));
+enum url_scheme url_scheme (const char *);
+bool url_has_scheme (const char *);
+int scheme_default_port (enum url_scheme);
+void scheme_disable (enum url_scheme);

 
 

-void rotate_backups PARAMS ((const char *));
-int mkalldirs PARAMS ((const char *));
-char *url_filename PARAMS ((const struct url *));
+char *url_string (const struct url *, bool);
+char *url_file_name (const struct url *);

 
 

-char *getproxy PARAMS ((enum url_scheme));
-int no_proxy_match PARAMS ((const char *, const char **));
+char *uri_merge (const char *, const char *);

 
 

-void convert_links PARAMS ((const char *, struct urlpos *));
+int mkalldirs (const char *);

 
 

-downloaded_file_t downloaded_file PARAMS ((downloaded_file_t, const char *));
+char *rewrite_shorthand_url (const char *);
+bool schemes_are_similar_p (enum url_scheme a, enum url_scheme b);

 
 

-char *rewrite_shorthand_url PARAMS ((const char *));
+bool are_urls_equal (const char *u1, const char *u2);

 
 #endif /* URL_H */
 
 #endif /* URL_H */