X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Furl.h;h=edb6b06bd1dee5724d2d337cb7eb86c3d81ab719;hp=7c8bcfed92875dbd21e98084a798e5b10761c448;hb=85b98d08341ccd2abd2b0335465927e85eb20757;hpb=bc8f473272ec29b0d0021dbcab6ac561ddc6249d diff --git a/src/url.h b/src/url.h index 7c8bcfed..edb6b06b 100644 --- a/src/url.h +++ b/src/url.h @@ -1,6 +1,7 @@ /* Declarations for url.c. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, + Inc. This file is part of GNU Wget. @@ -83,9 +84,10 @@ struct url /* Function declarations */ char *url_escape (const char *); +char *url_escape_unsafe_and_reserved (const char *); -struct url *url_parse (const char *, int *); -const char *url_error (int); +struct url *url_parse (const char *, int *, struct iri *iri, bool percent_encode); +char *url_error (const char *, int); char *url_full_path (const struct url *); void url_set_dir (struct url *, const char *); void url_set_file (struct url *, const char *); @@ -93,11 +95,12 @@ void url_free (struct url *); enum url_scheme url_scheme (const char *); bool url_has_scheme (const char *); +bool url_valid_scheme (const char *); int scheme_default_port (enum url_scheme); void scheme_disable (enum url_scheme); char *url_string (const struct url *, enum url_auth_mode); -char *url_file_name (const struct url *); +char *url_file_name (const struct url *, char *); char *uri_merge (const char *, const char *);