moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Further quote*()-related integrations in http.c.

Browse Source
This commit is contained in:
Steven Schubiger 2008-04-26 14:25:50 +02:00
parent 12db0ebf11
commit 883ff34537
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/http.c
View File

@ -810,7 +810,8 @@ print_response_line(const char *prefix, const char *b, const char *e)
{ {
char *copy; char *copy;
BOUNDED_TO_ALLOCA(b, e, copy); BOUNDED_TO_ALLOCA(b, e, copy);
logprintf (LOG_VERBOSE, "%s%s\n", prefix, escnonprint(copy)); logprintf (LOG_VERBOSE, "%s%s\n", prefix,
quotearg_style (escape_quoting_style, copy));
} }
/* Print the server response, line by line, omitting the trailing CRLF /* Print the server response, line by line, omitting the trailing CRLF
@ -1629,7 +1630,8 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
sock = pconn.socket; sock = pconn.socket;
using_ssl = pconn.ssl; using_ssl = pconn.ssl;
logprintf (LOG_VERBOSE, _("Reusing existing connection to %s:%d.\n"), logprintf (LOG_VERBOSE, _("Reusing existing connection to %s:%d.\n"),
escnonprint (pconn.host), pconn.port); quotearg_style (escape_quoting_style, pconn.host),
pconn.port);
DEBUGP (("Reusing fd %d.\n", sock)); DEBUGP (("Reusing fd %d.\n", sock));
if (pconn.authorized) if (pconn.authorized)
/* If the connection is already authorized, the "Basic" /* If the connection is already authorized, the "Basic"
@ -1717,7 +1719,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
{ {
failed_tunnel: failed_tunnel:
logprintf (LOG_NOTQUIET, _("Proxy tunneling failed: %s"), logprintf (LOG_NOTQUIET, _("Proxy tunneling failed: %s"),
message ? escnonprint (message) : "?"); message ? quotearg_style (escape_quoting_style, message) : "?");
xfree_null (message); xfree_null (message);
return CONSSLERR; return CONSSLERR;
} }
@ -1795,7 +1797,7 @@ gethttp (struct url *u, struct http_stat *hs, int *dt, struct url *proxy)
statcode = resp_status (resp, &message); statcode = resp_status (resp, &message);
if (!opt.server_response) if (!opt.server_response)
logprintf (LOG_VERBOSE, "%2d %s\n", statcode, logprintf (LOG_VERBOSE, "%2d %s\n", statcode,
message ? escnonprint (message) : ""); message ? quotearg_style (escape_quoting_style, message) : "");
else else
{ {
logprintf (LOG_VERBOSE, "\n"); logprintf (LOG_VERBOSE, "\n");
@ -2205,7 +2207,7 @@ File %s already there; not retrieving.\n\n"), quote (hs->local_file));
logputs (LOG_VERBOSE, logputs (LOG_VERBOSE,
opt.ignore_length ? _("ignored") : _("unspecified")); opt.ignore_length ? _("ignored") : _("unspecified"));
if (type) if (type)
logprintf (LOG_VERBOSE, " [%s]\n", escnonprint (type)); logprintf (LOG_VERBOSE, " [%s]\n", quotearg_style (escape_quoting_style, type));
else else
logputs (LOG_VERBOSE, "\n"); logputs (LOG_VERBOSE, "\n");
} }
@ -2576,7 +2578,8 @@ Remote file does not exist -- broken link!!!\n"));
else else
{ {
logprintf (LOG_NOTQUIET, _("%s ERROR %d: %s.\n"), logprintf (LOG_NOTQUIET, _("%s ERROR %d: %s.\n"),
tms, hstat.statcode, escnonprint (hstat.error)); tms, hstat.statcode,
quotearg_style (escape_quoting_style, hstat.error));
} }
logputs (LOG_VERBOSE, "\n"); logputs (LOG_VERBOSE, "\n");
ret = WRONGCODE; ret = WRONGCODE;