X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Firi.c;h=08cfde40fb04d0d66a460c69ebb030d0d6d2c347;hp=32eb7210fdea7d2cbca2d8ab2414510611404c79;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=9a2ea3938d09643c6528c3b83b1db4c30f47d981 diff --git a/src/iri.c b/src/iri.c index 32eb7210..08cfde40 100644 --- a/src/iri.c +++ b/src/iri.c @@ -1,5 +1,5 @@ /* IRI related functions. - Copyright (C) 2008 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Wget. @@ -31,7 +31,6 @@ as that of the covered work. */ #include #include -#include #include #include #include @@ -39,15 +38,12 @@ as that of the covered work. */ #include #include "utils.h" -#include "iri.h" -char *remote; -char *current; +/* RFC3987 section 3.1 mandates STD3 ASCII RULES */ +#define IDNA_FLAGS IDNA_USE_STD3_ASCII_RULES -static iconv_t locale2utf8; +/* Note: locale encoding is kept in options struct (opt.locale) */ - -static bool open_locale_to_utf8 (void); static bool do_conversion (iconv_t cd, char *in, size_t inlen, char **out); @@ -91,7 +87,6 @@ parse_charset (char *str) char * find_locale (void) { - /* sXXXav, made our own function or use libidn one ?! */ return (char *) stringprep_locale_charset (); } @@ -105,7 +100,7 @@ check_encoding_name (char *encoding) { if (!c_isascii (*s) || c_isspace (*s)) { - logprintf (LOG_VERBOSE, "Encoding %s isn't valid\n", quote (encoding)); + logprintf (LOG_VERBOSE, _("Encoding %s isn't valid\n"), quote (encoding)); return false; } @@ -115,52 +110,41 @@ check_encoding_name (char *encoding) return true; } -/* Try opening an iconv_t descriptor for conversion from locale to UTF-8 */ -static bool -open_locale_to_utf8 (void) +/* Try converting string str from locale to UTF-8. Return a new string + on success, or str on error or if conversion isn't needed. */ +const char * +locale_to_utf8 (const char *str) { - if (locale2utf8) - return true; + iconv_t l2u; + char *new; - /* sXXXav : That shouldn't happen, just in case */ + /* That shouldn't happen, just in case */ if (!opt.locale) { - logprintf (LOG_VERBOSE, "open_locale_to_utf8: locale is unset\n"); + logprintf (LOG_VERBOSE, _("locale_to_utf8: locale is unset\n")); opt.locale = find_locale (); } - if (!opt.locale) - return false; - - locale2utf8 = iconv_open ("UTF-8", opt.locale); - if (locale2utf8 != (iconv_t)(-1)) - return true; - - logprintf (LOG_VERBOSE, "Conversion from %s to %s isn't supported\n", - quote (opt.locale), quote ("UTF-8")); - locale2utf8 = NULL; - return false; -} - -/* Return a new string */ -const char * -locale_to_utf8 (const char *str) -{ - char *new; - - if (!strcasecmp (opt.locale, "utf-8")) + if (!opt.locale || !strcasecmp (opt.locale, "utf-8")) return str; - if (!open_locale_to_utf8 ()) - return str; + l2u = iconv_open ("UTF-8", opt.locale); + if (l2u != (iconv_t)(-1)) + { + logprintf (LOG_VERBOSE, _("Conversion from %s to %s isn't supported\n"), + quote (opt.locale), quote ("UTF-8")); + return str; + } - if (do_conversion (locale2utf8, (char *) str, strlen ((char *) str), &new)) + if (do_conversion (l2u, (char *) str, strlen ((char *) str), &new)) return (const char *) new; return str; } -/* */ +/* Do the conversion according to the passed conversion descriptor cd. *out + will contain the transcoded string on success. *out content is + unspecified otherwise. */ static bool do_conversion (iconv_t cd, char *in, size_t inlen, char **out) { @@ -174,7 +158,6 @@ do_conversion (iconv_t cd, char *in, size_t inlen, char **out) len = outlen; done = 0; - /* sXXXav : put a maximum looping factor ??? */ for (;;) { if (iconv (cd, &in, &inlen, out, &outlen) != (size_t)(-1)) @@ -189,7 +172,7 @@ do_conversion (iconv_t cd, char *in, size_t inlen, char **out) { if (!invalid) logprintf (LOG_VERBOSE, - "Incomplete or invalide multibyte sequence encountered\n"); + _("Incomplete or invalid multibyte sequence encountered\n")); invalid++; **out = *in; @@ -214,7 +197,7 @@ do_conversion (iconv_t cd, char *in, size_t inlen, char **out) } else /* Weird, we got an unspecified error */ { - logprintf (LOG_VERBOSE, "Unhandled errno %d\n", errno); + logprintf (LOG_VERBOSE, _("Unhandled errno %d\n"), errno); break; } } @@ -222,32 +205,28 @@ do_conversion (iconv_t cd, char *in, size_t inlen, char **out) return false; } -/* Try to ASCII encode UTF-8 host. Return the new domain on success or NULL +/* Try to "ASCII encode" UTF-8 host. Return the new domain on success or NULL on error. */ char * -idn_encode (char *host, bool utf8_encoded) +idn_encode (struct iri *i, char *host) { char *new; int ret; - /* Encode to UTF-8 if not done using current remote */ - if (!utf8_encoded) + /* Encode to UTF-8 if not done */ + if (!i->utf8_encode) { - if (!remote_to_utf8 ((const char *) host, (const char **) &new)) - { - /* Nothing to encode or an error occured */ - return NULL; - } - + if (!remote_to_utf8 (i, (const char *) host, (const char **) &new)) + return NULL; /* Nothing to encode or an error occured */ host = new; } /* toASCII UTF-8 NULL terminated string */ - ret = idna_to_ascii_8z (host, &new, 0); + ret = idna_to_ascii_8z (host, &new, IDNA_FLAGS); if (ret != IDNA_SUCCESS) { /* sXXXav : free new when needed ! */ - logprintf (LOG_VERBOSE, "idn_encode failed (%d): %s\n", ret, + logprintf (LOG_VERBOSE, _("idn_encode failed (%d): %s\n"), ret, quote (idna_strerror (ret))); return NULL; } @@ -255,18 +234,18 @@ idn_encode (char *host, bool utf8_encoded) return new; } -/* Try to decode an ASCII encoded host. Return the new domain in the locale on - success or NULL on error. */ +/* Try to decode an "ASCII encoded" host. Return the new domain in the locale + on success or NULL on error. */ char * idn_decode (char *host) { char *new; int ret; - ret = idna_to_unicode_8zlz (host, &new, 0); + ret = idna_to_unicode_8zlz (host, &new, IDNA_FLAGS); if (ret != IDNA_SUCCESS) { - logprintf (LOG_VERBOSE, "idn_decode failed (%d): %s\n", ret, + logprintf (LOG_VERBOSE, _("idn_decode failed (%d): %s\n"), ret, quote (idna_strerror (ret))); return NULL; } @@ -274,22 +253,18 @@ idn_decode (char *host) return new; } -/* Return a new string */ +/* Try to transcode string str from remote encoding to UTF-8. On success, *new + contains the transcoded string. *new content is unspecified otherwise. */ bool -remote_to_utf8 (const char *str, const char **new) +remote_to_utf8 (struct iri *i, const char *str, const char **new) { - char *remote; iconv_t cd; bool ret = false; - if (opt.encoding_remote) - remote = opt.encoding_remote; - else if (current) - remote = current; - else + if (!i->uri_encoding) return false; - cd = iconv_open ("UTF-8", remote); + cd = iconv_open ("UTF-8", i->uri_encoding); if (cd == (iconv_t)(-1)) return false; @@ -308,53 +283,71 @@ remote_to_utf8 (const char *str, const char **new) return ret; } -char *get_remote_charset (void) +/* Allocate a new iri structure and return a pointer to it. */ +struct iri * +iri_new (void) { - return remote; + struct iri *i = xmalloc (sizeof *i); + i->uri_encoding = opt.encoding_remote ? xstrdup (opt.encoding_remote) : NULL; + i->content_encoding = NULL; + i->orig_url = NULL; + i->utf8_encode = opt.enable_iri; + return i; } -char *get_current_charset (void) +struct iri *iri_dup (const struct iri *src) { - return current; + struct iri *i = xmalloc (sizeof *i); + i->uri_encoding = src->uri_encoding ? xstrdup (src->uri_encoding) : NULL; + i->content_encoding = (src->content_encoding ? + xstrdup (src->content_encoding) : NULL); + i->orig_url = src->orig_url ? xstrdup (src->orig_url) : NULL; + i->utf8_encode = src->utf8_encode; + return i; } -void set_current_charset (char *charset) -{ - /*printf("[ current = `%s'\n", charset);*/ - - if (current) - xfree (current); - - current = charset ? xstrdup (charset) : NULL; -} - -void set_current_as_locale (void) +/* Completely free an iri structure. */ +void +iri_free (struct iri *i) { - /*printf("[ current = locale = `%s'\n", opt.locale);*/ - if (current) - xfree (current); - - /* sXXXav : assert opt.locale NULL ? */ - current = xstrdup (opt.locale); + xfree_null (i->uri_encoding); + xfree_null (i->content_encoding); + xfree_null (i->orig_url); + xfree (i); } +/* Set uri_encoding of struct iri i. If a remote encoding was specified, use + it unless force is true. */ void -set_remote_charset (char *charset) +set_uri_encoding (struct iri *i, char *charset, bool force) { - /*printf("[ remote = `%s'\n", charset);*/ - if (remote) - xfree (remote); + DEBUGP (("URI encoding = %s\n", charset ? quote (charset) : "None")); + if (!force && opt.encoding_remote) + return; + if (i->uri_encoding) + { + if (charset && !strcasecmp (i->uri_encoding, charset)) + return; + xfree (i->uri_encoding); + } - remote = charset ? xstrdup (charset) : NULL; + i->uri_encoding = charset ? xstrdup (charset) : NULL; } +/* Set content_encoding of struct iri i. */ void -set_remote_as_current (void) +set_content_encoding (struct iri *i, char *charset) { - /*printf("[ remote = current = `%s'\n", current);*/ - if (remote) - xfree (remote); + DEBUGP (("URI content encoding = %s\n", charset ? quote (charset) : "None")); + if (opt.encoding_remote) + return; + if (i->content_encoding) + { + if (charset && !strcasecmp (i->content_encoding, charset)) + return; + xfree (i->content_encoding); + } - remote = current ? xstrdup (current) : NULL; + i->content_encoding = charset ? xstrdup (charset) : NULL; }