#include "convert.h"
extern char *version_string;
-extern LARGE_INT total_downloaded_bytes;
extern FILE *output_stream;
extern bool output_stream_regular;
/* Handle (possibly multiple instances of) the Set-Cookie header. */
if (opt.cookies)
{
- char *pth = NULL;
int scpos;
const char *scbeg, *scend;
/* The jar should have been created by now. */
++scpos)
{
char *set_cookie; BOUNDED_TO_ALLOCA (scbeg, scend, set_cookie);
- if (pth == NULL)
- {
- /* u->path doesn't begin with /, which cookies.c expects. */
- pth = (char *) alloca (1 + strlen (u->path) + 1);
- pth[0] = '/';
- strcpy (pth + 1, u->path);
- }
- cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port, pth,
- set_cookie);
+ cookie_handle_set_cookie (wget_cookie_jar, u->host, u->port,
+ u->path, set_cookie);
}
}
logputs (LOG_VERBOSE, _("Length: "));
if (contlen != -1)
{
- logputs (LOG_VERBOSE, with_thousand_seps (contlen + contrange));
+ logputs (LOG_VERBOSE, number_to_static_string (contlen + contrange));
if (contlen + contrange >= 1024)
logprintf (LOG_VERBOSE, " (%s)",
human_readable (contlen + contrange));
{
if (contlen >= 1024)
logprintf (LOG_VERBOSE, _(", %s (%s) remaining"),
- with_thousand_seps (contlen),
+ number_to_static_string (contlen),
human_readable (contlen));
else
logprintf (LOG_VERBOSE, _(", %s remaining"),
- with_thousand_seps (contlen));
+ number_to_static_string (contlen));
}
}
else
bool use_ts, got_head = false;/* time-stamping info */
char *filename_plus_orig_suffix;
char *local_filename = NULL;
- char *tms, *locf, *tmrate;
+ char *tms, *locf;
+ const char *tmrate;
uerr_t err;
time_t tml = -1, tmr = -1; /* local and remote time-stamps */
wgint local_size = 0; /* the size of the local file */
*newloc = NULL;
/* Warn on (likely bogus) wildcard usage in HTTP. */
- if (has_wildcards_p (u->path))
+ if (opt.ftp_glob && has_wildcards_p (u->path))
logputs (LOG_VERBOSE, _("Warning: wildcards not supported in HTTP.\n"));
xzero (hstat);
return RETROK;
}
- tmrate = retr_rate (hstat.rd_size, hstat.dltime, 0);
+ tmrate = retr_rate (hstat.rd_size, hstat.dltime);
+ total_download_time += hstat.dltime;
if (hstat.len == hstat.contlen)
{