X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Firi.h;h=fe3da15cf416bd6a104e84d855e0e261de9b960d;hb=889f705d1bc7eb439ddb0192249e44783196ce00;hp=173d065668270e6e2300bf9bf603b9c7cffca9a0;hpb=d82f80ecab9bfef857d780f894cca7e890780ce0;p=wget diff --git a/src/iri.h b/src/iri.h index 173d0656..fe3da15c 100644 --- a/src/iri.h +++ b/src/iri.h @@ -31,9 +31,10 @@ as that of the covered work. */ #define IRI_H struct iri { - char *uri_encoding; /* Encoding of the uri to fetch */ + char *uri_encoding; /* Encoding of the uri to fetch */ char *content_encoding; /* Encoding of links inside the fetched file */ - bool utf8_encode; /* Will/Is the current url encoded in utf8 */ + char *orig_url; /* */ + bool utf8_encode; /* Will/Is the current url encoded in utf8 */ }; #ifdef ENABLE_IRI @@ -46,8 +47,9 @@ char *idn_encode (struct iri *i, char *host); char *idn_decode (char *host); bool remote_to_utf8 (struct iri *i, const char *str, const char **new); struct iri *iri_new (void); +struct iri *iri_dup (const struct iri *); void iri_free (struct iri *i); -void set_uri_encoding (struct iri *i, char *charset); +void set_uri_encoding (struct iri *i, char *charset, bool force); void set_content_encoding (struct iri *i, char *charset); #else /* ENABLE_IRI */ @@ -58,12 +60,12 @@ struct iri dummy_iri; #define find_locale() NULL #define check_encoding_name(str) false #define locale_to_utf8(str) (str) -#define idn_encode(a,b,c) NULL +#define idn_encode(a,b) NULL #define idn_decode(str) NULL #define remote_to_utf8(a,b,c) false #define iri_new() (&dummy_iri) #define iri_free(a) -#define set_uri_encoding(a,b) +#define set_uri_encoding(a,b,c) #define set_content_encoding(a,b) #endif /* ENABLE_IRI */