/* File retrieval.
Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
-This file is part of Wget.
+This file is part of GNU Wget.
-This program is free software; you can redistribute it and/or modify
+GNU Wget is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-This program is distributed in the hope that it will be useful,
+GNU Wget is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
+along with Wget; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include <config.h>
extern int errno;
#endif
-#ifdef WINDOWS
-LARGE_INTEGER internal_time;
-#else
-/* Internal variables used by the timer. */
-static long internal_secs, internal_msecs;
-#endif
-
/* See the comment in gethttp() why this is needed. */
int global_download_count;
void logflush PARAMS ((void));
-
-/* From http.c. */
-uerr_t http_loop PARAMS ((struct urlinfo *, char **, int *));
\f
/* Flags for show_progress(). */
enum spflags { SP_NONE, SP_INIT, SP_FINISH };
static int
show_progress (long res, long expected, enum spflags flags)
{
+ static struct wget_timer *timer;
static long line_bytes;
static long offs, initial_skip;
static int ndot, nrow;
- static long last_timer, time_offset;
+ static long last_timer_value, time_offset;
int any_output = 0;
if (flags == SP_FINISH)
{
- if (expected)
+ int dot = ndot;
+ char *tmpstr = (char *)alloca (2 * opt.dots_in_line + 1);
+ char *tmpp = tmpstr;
+ time_offset = wtimer_elapsed (timer) - last_timer_value;
+ for (; dot < opt.dots_in_line; dot++)
{
- int dot = ndot;
- char *tmpstr = (char *)alloca (2 * opt.dots_in_line + 1);
- char *tmpp = tmpstr;
- time_offset = elapsed_time () - last_timer;
- for (; dot < opt.dots_in_line; dot++)
- {
- if (!(dot % opt.dot_spacing))
- *tmpp++ = ' ';
- *tmpp++ = ' ';
- }
- *tmpp = '\0';
- logputs (LOG_VERBOSE, tmpstr);
- print_percentage (nrow * line_bytes + ndot * opt.dot_bytes + offs,
- expected);
- logprintf (LOG_VERBOSE, " @%s",
- rate (ndot * opt.dot_bytes
- + offs - (initial_skip % line_bytes),
- time_offset, 1));
+ if (!(dot % opt.dot_spacing))
+ *tmpp++ = ' ';
+ *tmpp++ = ' ';
}
+ *tmpp = '\0';
+ logputs (LOG_VERBOSE, tmpstr);
+ if (expected)
+ print_percentage (nrow * line_bytes + ndot * opt.dot_bytes + offs,
+ expected);
+ logprintf (LOG_VERBOSE, " @%s",
+ rate (ndot * opt.dot_bytes
+ + offs - (initial_skip % line_bytes),
+ time_offset, 1));
logputs (LOG_VERBOSE, "\n\n");
return 0;
}
offs = 0L;
ndot = nrow = 0;
line_bytes = (long)opt.dots_in_line * opt.dot_bytes;
- last_timer = elapsed_time ();
+ if (!timer)
+ timer = wtimer_allocate ();
+ wtimer_reset (timer);
+ last_timer_value = 0;
time_offset = 0;
initial_skip = res;
if (res)
++ndot;
if (ndot == opt.dots_in_line)
{
- time_offset = elapsed_time () - last_timer;
- last_timer += time_offset;
+ time_offset = wtimer_elapsed (timer) - last_timer_value;
+ last_timer_value += time_offset;
ndot = 0;
++nrow;
if (expected)
- {
- print_percentage (nrow * line_bytes, expected);
- logprintf (LOG_VERBOSE, " @%s",
- rate (line_bytes - (initial_skip % line_bytes),
- time_offset, 1));
- }
+ print_percentage (nrow * line_bytes, expected);
+ logprintf (LOG_VERBOSE, " @%s",
+ rate (line_bytes - (initial_skip % line_bytes),
+ time_offset, 1));
initial_skip = 0;
logprintf (LOG_VERBOSE, "\n%5ldK", nrow * line_bytes / 1024);
}
/* Reenable flushing. */
opt.no_flush = 0;
if (any_output)
- /* Force flush. #### Oh, what a kludge! */
+ /* Force flush. */
logflush ();
return any_output;
}
\f
-/* Reset the internal timer. */
-void
-reset_timer (void)
-{
-#ifndef WINDOWS
- /* Under Unix, the preferred way to measure the passage of time is
- through gettimeofday() because of its granularity. However, on
- some old or weird systems, gettimeofday() might not be available.
- There we use the simple time(). */
-# ifdef HAVE_GETTIMEOFDAY
- struct timeval t;
- gettimeofday (&t, NULL);
- internal_secs = t.tv_sec;
- internal_msecs = t.tv_usec / 1000;
-# else /* not HAVE_GETTIMEOFDAY */
- internal_secs = time (NULL);
- internal_msecs = 0;
-# endif /* not HAVE_GETTIMEOFDAY */
-#else /* WINDOWS */
- /* Under Windows, use Windows-specific APIs. */
- FILETIME ft;
- SYSTEMTIME st;
- GetSystemTime(&st);
- SystemTimeToFileTime(&st,&ft);
- internal_time.HighPart = ft.dwHighDateTime;
- internal_time.LowPart = ft.dwLowDateTime;
-#endif /* WINDOWS */
-}
-
-/* Return the time elapsed from the last call to reset_timer(), in
- milliseconds. */
-long
-elapsed_time (void)
-{
-#ifndef WINDOWS
-# ifdef HAVE_GETTIMEOFDAY
- struct timeval t;
- gettimeofday (&t, NULL);
- return ((t.tv_sec - internal_secs) * 1000
- + (t.tv_usec / 1000 - internal_msecs));
-# else /* not HAVE_GETTIMEOFDAY */
- return 1000 * ((long)time (NULL) - internal_secs);
-# endif /* not HAVE_GETTIMEOFDAY */
-#else /* WINDOWS */
- FILETIME ft;
- SYSTEMTIME st;
- LARGE_INTEGER li;
- GetSystemTime(&st);
- SystemTimeToFileTime(&st,&ft);
- li.HighPart = ft.dwHighDateTime;
- li.LowPart = ft.dwLowDateTime;
- return (long) ((li.QuadPart - internal_time.QuadPart) / 1e4);
-#endif /* WINDOWS */
-}
-
/* Print out the appropriate download rate. Appropriate means that if
rate is > 1024 bytes per second, kilobytes are used, and if rate >
1024 * 1024 bps, megabytes are used.
static char res[15];
double dlrate;
- if (!msecs)
- ++msecs;
+ if (msecs == 0)
+ /* If elapsed time is 0, it means we're under the granularity of
+ the timer. This often happens on systems that use time() for
+ the timer. */
+ msecs = wtimer_granularity ();
+
dlrate = (double)1000 * bytes / msecs;
if (dlrate < 1024.0)
sprintf (res, pad ? "%7.2f B/s" : "%.2f B/s", dlrate);
else if (dlrate < 1024.0 * 1024.0)
sprintf (res, pad ? "%7.2f KB/s" : "%.2f KB/s", dlrate / 1024.0);
- else
+ else if (dlrate < 1024.0 * 1024.0 * 1024.0)
sprintf (res, pad ? "%7.2f MB/s" : "%.2f MB/s", dlrate / (1024.0 * 1024.0));
+ else
+ /* Maybe someone will need this one day. More realistically, it
+ will get tickled by buggy timers. */
+ sprintf (res, pad ? "%7.2f GB/s" : "%.2f GB/s",
+ dlrate / (1024.0 * 1024.0 * 1024.0));
+
return res;
}
\f
-#define USE_PROXY_P(u) (opt.use_proxy && getproxy((u)->proto) \
+#define USE_PROXY_P(u) (opt.use_proxy && getproxy((u)->scheme) \
&& no_proxy_match((u)->host, \
(const char **)opt.no_proxy))
uerr_t result;
char *url;
int location_changed, dummy;
- int local_use_proxy;
+ int use_proxy;
char *mynewloc, *proxy;
- struct urlinfo *u;
+ struct url *u;
+ int up_error_code; /* url parse error code */
+ char *local_file;
struct hash_table *redirections = NULL;
/* If dt is NULL, just ignore it. */
if (file)
*file = NULL;
- u = newurl ();
- /* Parse the URL. */
- result = parseurl (url, u, 0);
- if (result != URLOK)
+ u = url_parse (url, &up_error_code);
+ if (!u)
{
- logprintf (LOG_NOTQUIET, "%s: %s.\n", url, uerrmsg (result));
- freeurl (u, 1);
+ logprintf (LOG_NOTQUIET, "%s: %s.\n", url, url_error (up_error_code));
if (redirections)
string_set_free (redirections);
xfree (url);
- return result;
+ return URLERROR;
}
+ if (!refurl)
+ refurl = opt.referer;
+
redirected:
- /* Set the referer. */
- if (refurl)
- u->referer = xstrdup (refurl);
- else
- {
- if (opt.referer)
- u->referer = xstrdup (opt.referer);
- else
- u->referer = NULL;
- }
+ result = NOCONERROR;
+ mynewloc = NULL;
+ local_file = NULL;
- local_use_proxy = USE_PROXY_P (u);
- if (local_use_proxy)
+ use_proxy = USE_PROXY_P (u);
+ if (use_proxy)
{
- struct urlinfo *pu = newurl ();
-
- /* Copy the original URL to new location. */
- memcpy (pu, u, sizeof (*u));
- pu->proxy = NULL; /* A minor correction :) */
- /* Initialize u to nil. */
- memset (u, 0, sizeof (*u));
- u->proxy = pu;
- /* Get the appropriate proxy server, appropriate for the
- current protocol. */
- proxy = getproxy (pu->proto);
+ struct url *proxy_url;
+
+ /* Get the proxy server for the current scheme. */
+ proxy = getproxy (u->scheme);
if (!proxy)
{
logputs (LOG_NOTQUIET, _("Could not find proxy host.\n"));
- freeurl (u, 1);
+ url_free (u);
if (redirections)
string_set_free (redirections);
xfree (url);
return PROXERR;
}
+
/* Parse the proxy URL. */
- result = parseurl (proxy, u, 0);
- if (result != URLOK || u->proto != URLHTTP)
+ proxy_url = url_parse (proxy, &up_error_code);
+ if (!proxy_url)
{
- if (u->proto == URLHTTP)
- logprintf (LOG_NOTQUIET, "Proxy %s: %s.\n", proxy, uerrmsg(result));
- else
- logprintf (LOG_NOTQUIET, _("Proxy %s: Must be HTTP.\n"), proxy);
- freeurl (u, 1);
+ logprintf (LOG_NOTQUIET, "Error parsing proxy URL %s: %s.\n",
+ proxy, url_error (up_error_code));
+ if (redirections)
+ string_set_free (redirections);
+ xfree (url);
+ return PROXERR;
+ }
+ if (proxy_url->scheme != SCHEME_HTTP)
+ {
+ logprintf (LOG_NOTQUIET, _("Error in proxy URL %s: Must be HTTP.\n"), proxy);
+ url_free (proxy_url);
if (redirections)
string_set_free (redirections);
xfree (url);
return PROXERR;
}
- u->proto = URLHTTP;
- }
-
- assert (u->proto != URLFILE); /* #### Implement me! */
- mynewloc = NULL;
- if (u->proto == URLHTTP
+ result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url);
+ url_free (proxy_url);
+ }
+ else if (u->scheme == SCHEME_HTTP
#ifdef HAVE_SSL
- || u->proto == URLHTTPS
+ || u->scheme == SCHEME_HTTPS
#endif
)
- result = http_loop (u, &mynewloc, dt);
- else if (u->proto == URLFTP)
+ {
+ result = http_loop (u, &mynewloc, &local_file, refurl, dt, NULL);
+ }
+ else if (u->scheme == SCHEME_FTP)
{
/* If this is a redirection, we must not allow recursive FTP
retrieval, so we save recursion to oldrec, and restore it
opt.recursive = 0;
result = ftp_loop (u, dt);
opt.recursive = oldrec;
+#if 0
/* There is a possibility of having HTTP being redirected to
FTP. In these cases we must decide whether the text is HTML
according to the suffix. The HTML suffixes are `.html' and
- `.htm', case-insensitive.
-
- #### All of this is, of course, crap. These types should be
- determined through mailcap. */
- if (redirections && u->local && (u->proto == URLFTP ))
+ `.htm', case-insensitive. */
+ if (redirections && u->local && (u->scheme == SCHEME_FTP))
{
char *suf = suffix (u->local);
if (suf && (!strcasecmp (suf, "html") || !strcasecmp (suf, "htm")))
*dt |= TEXTHTML;
FREE_MAYBE (suf);
}
+#endif
}
location_changed = (result == NEWLOCATION);
if (location_changed)
{
char *construced_newloc;
- uerr_t newloc_result;
- struct urlinfo *newloc_struct;
+ struct url *newloc_struct;
assert (mynewloc != NULL);
+ if (local_file)
+ xfree (local_file);
+
/* The HTTP specs only allow absolute URLs to appear in
redirects, but a ton of boneheaded webservers and CGIs out
there break the rules and use relative URLs, and popular
mynewloc = construced_newloc;
/* Now, see if this new location makes sense. */
- newloc_struct = newurl ();
- newloc_result = parseurl (mynewloc, newloc_struct, 1);
- if (newloc_result != URLOK)
+ newloc_struct = url_parse (mynewloc, NULL);
+ if (!newloc_struct)
{
- logprintf (LOG_NOTQUIET, "%s: %s.\n", mynewloc, uerrmsg (newloc_result));
- freeurl (newloc_struct, 1);
- freeurl (u, 1);
+ logprintf (LOG_NOTQUIET, "%s: %s.\n", mynewloc, "UNKNOWN");
+ url_free (newloc_struct);
+ url_free (u);
if (redirections)
string_set_free (redirections);
xfree (url);
string_set_add (redirections, u->url);
}
- /* The new location is OK. Let's check for redirection cycle by
+ /* The new location is OK. Check for redirection cycle by
peeking through the history of redirections. */
- if (string_set_exists (redirections, newloc_struct->url))
+ if (string_set_contains (redirections, newloc_struct->url))
{
logprintf (LOG_NOTQUIET, _("%s: Redirection cycle detected.\n"),
mynewloc);
- freeurl (newloc_struct, 1);
- freeurl (u, 1);
+ url_free (newloc_struct);
+ url_free (u);
if (redirections)
string_set_free (redirections);
xfree (url);
xfree (url);
url = mynewloc;
- freeurl (u, 1);
+ url_free (u);
u = newloc_struct;
goto redirected;
}
- if (u->local)
+ if (local_file)
{
if (*dt & RETROKF)
{
- register_download (url, u->local);
+ register_download (url, local_file);
if (*dt & TEXTHTML)
- register_html (url, u->local);
+ register_html (url, local_file);
}
}
if (file)
- {
- if (u->local)
- *file = xstrdup (u->local);
- else
- *file = NULL;
- }
- freeurl (u, 1);
+ *file = local_file ? local_file : NULL;
+ else
+ FREE_MAYBE (local_file);
+
+ url_free (u);
if (redirections)
string_set_free (redirections);
projects / wget / blobdiff