aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[idn] Convert domain name to utf-8 from gettext codepage.

Browse Source
This commit is contained in:
Witold Filipczyk 2022-06-01 22:24:07 +02:00
parent f7f6b35546
commit 22e8a83472
2 changed files with 41 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/document/document.c
View File

@ -112,20 +112,10 @@ get_ip(struct document *document)
{ {
#ifdef HAVE_INET_NTOP #ifdef HAVE_INET_NTOP
struct uri *uri = document->uri; struct uri *uri = document->uri;
char *host = memacpy(uri->host, uri->hostlen); char *host = get_uri_string(uri, URI_DNS_HOST);
if (host) { if (host) {
#ifdef CONFIG_IDN
char *idname;
int code = idna_to_ascii_lz(host, &idname, 0);
if (code == IDNA_SUCCESS) {
find_host(idname, &document->querydns, found_dns, &document->ip, 0);
free(idname);
}
#else
find_host(host, &document->querydns, found_dns, &document->ip, 0); find_host(host, &document->querydns, found_dns, &document->ip, 0);
#endif
mem_free(host); mem_free(host);
} }
#endif #endif

49
src/protocol/uri.c
View File

@ -6,6 +6,9 @@
#include <ctype.h> #include <ctype.h>
#include <errno.h> #include <errno.h>
#ifdef HAVE_ICONV
#include <iconv.h>
#endif
#ifdef HAVE_IDNA_H #ifdef HAVE_IDNA_H
#include <idna.h> #include <idna.h>
#endif #endif
@ -29,6 +32,7 @@
#include "elinks.h" #include "elinks.h"
#include "intl/libintl.h"
#include "main/object.h" #include "main/object.h"
#include "protocol/protocol.h" #include "protocol/protocol.h"
#include "protocol/uri.h" #include "protocol/uri.h"
@ -535,17 +539,46 @@ add_uri_to_string(struct string *string, const struct uri *uri,
/* Support for the GNU International Domain Name library. /* Support for the GNU International Domain Name library.
* *
* http://www.gnu.org/software/libidn/manual/html_node/IDNA-Functions.html * http://www.gnu.org/software/libidn/manual/html_node/IDNA-Functions.html
* */
* Now it is probably not perfect because idna_to_ascii_lz()
* will be using a ``zero terminated input string encoded in
* the current locale's character set''. Anyway I don't know
* how to convert anything to UTF-8 or Unicode. --jonas */
if (wants(URI_IDN)) { if (wants(URI_IDN)) {
char *host = memacpy(uri->host, uri->hostlen); char *host = NULL;
#if defined(CONFIG_NLS) || defined(CONFIG_GETTEXT)
if (current_charset != -1 && !is_cp_utf8(current_charset)) {
size_t iconv_res;
size_t ileft = uri->hostlen;
size_t oleft = ileft * 8;
char *inbuf, *outbuf;
char *utf8_data = (char *)mem_calloc(1, oleft);
iconv_t cd;
if (!utf8_data) {
goto error;
}
cd = iconv_open("utf-8", get_cp_mime_name(current_charset));
if (cd == (iconv_t)-1) {
mem_free(utf8_data);
goto error;
}
inbuf = uri->host;
outbuf = utf8_data;
iconv_res = iconv(cd, &inbuf, &ileft, &outbuf, &oleft);
if (iconv_res == -1) {
mem_free(utf8_data);
goto error;
}
iconv_close(cd);
host = utf8_data;
}
error:
#endif
if (!host) {
host = memacpy(uri->host, uri->hostlen);
}
if (host) { if (host) {
char *idname; char *idname;
int code = idna_to_ascii_lz(host, &idname, 0); int code = idna_to_ascii_8z(host, &idname, 0);
/* FIXME: Return NULL if it coughed? --jonas */ /* FIXME: Return NULL if it coughed? --jonas */
if (code == IDNA_SUCCESS) { if (code == IDNA_SUCCESS) {
@ -553,11 +586,9 @@ add_uri_to_string(struct string *string, const struct uri *uri,
free(idname); free(idname);
add_host = 0; add_host = 0;
} }
mem_free(host); mem_free(host);
} }
} }
#endif #endif
if (add_host) if (add_host)
add_bytes_to_string(string, uri->host, uri->hostlen); add_bytes_to_string(string, uri->host, uri->hostlen);