X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fconnect.c;h=41258d26fca07176243b1b498a5afbba34cdc299;hb=84395897ad2d1c107be470946daba744b2e7ebe8;hp=2be764d41c2356f0302eafd41fadd8153c386ceb;hpb=1db9f1e9acb901b14bf64fc126a6662ebcf6cd75;p=wget diff --git a/src/connect.c b/src/connect.c index 2be764d4..41258d26 100644 --- a/src/connect.c +++ b/src/connect.c @@ -195,8 +195,8 @@ resolve_bind_address (struct sockaddr *sa) { /* #### We should be able to print the error message here. */ logprintf (LOG_NOTQUIET, - _("%s: unable to resolve bind address `%s'; disabling bind.\n"), - exec_name, opt.bind_address); + _("%s: unable to resolve bind address %s; disabling bind.\n"), + exec_name, quote (opt.bind_address)); should_bind = false; return false; } @@ -266,9 +266,25 @@ connect_to_ip (const ip_address *ip, int port, const char *print) if (print) { const char *txt_addr = print_address (ip); - if (print && 0 != strcmp (print, txt_addr)) - logprintf (LOG_VERBOSE, _("Connecting to %s|%s|:%d... "), - escnonprint (print), txt_addr, port); + if (0 != strcmp (print, txt_addr)) + { + char *str = NULL, *name; + + if (opt.enable_iri && (name = idn_decode ((char *) print)) != NULL) + { + int len = strlen (print) + strlen (name) + 4; + str = xmalloc (len); + snprintf (str, len, "%s (%s)", name, print); + str[len-1] = '\0'; + xfree (name); + } + + logprintf (LOG_VERBOSE, _("Connecting to %s|%s|:%d... "), + str ? str : escnonprint_uri (print), txt_addr, port); + + if (str) + xfree (str); + } else logprintf (LOG_VERBOSE, _("Connecting to %s:%d... "), txt_addr, port); } @@ -366,8 +382,8 @@ connect_to_host (const char *host, int port) if (!al) { logprintf (LOG_NOTQUIET, - _("%s: unable to resolve host address `%s'\n"), - exec_name, host); + _("%s: unable to resolve host address %s\n"), + exec_name, quote (host)); return E_HOST; }