/* File retrieval.
Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+ Inc.
This file is part of GNU Wget.
#include <stdio.h>
#include <stdlib.h>
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
-#endif /* HAVE_UNISTD_H */
+#include <unistd.h>
#include <errno.h>
#include <string.h>
#include <assert.h>
{
int ret = 0;
- static char dlbuf[16384];
- int dlbufsize = sizeof (dlbuf);
+ int dlbufsize = BUFSIZ;
+ char *dlbuf = xmalloc (BUFSIZ);
struct ptimer *timer = NULL;
double last_successful_read_tm = 0;
if (qtywritten)
*qtywritten += sum_written;
+ free (dlbuf);
+
return ret;
}
\f
#endif
|| (proxy_url && proxy_url->scheme == SCHEME_HTTP))
{
- result = http_loop (u, &mynewloc, &local_file, refurl, dt, proxy_url, iri);
+ result = http_loop (u, orig_parsed, &mynewloc, &local_file, refurl, dt,
+ proxy_url, iri);
}
else if (u->scheme == SCHEME_FTP)
{
DEBUGP (("[Couldn't fallback to non-utf8 for %s\n", quote (url)));
}
- if (local_file && *dt & RETROKF)
+ if (local_file && u && *dt & RETROKF)
{
register_download (u->url, local_file);
+
if (redirection_count && 0 != strcmp (origurl, u->url))
register_redirection (origurl, u->url);
+
if (*dt & TEXTHTML)
register_html (u->url, local_file);
- if (*dt & RETROKF)
- {
- register_download (u->url, local_file);
- if (redirection_count && 0 != strcmp (origurl, u->url))
- register_redirection (origurl, u->url);
- if (*dt & TEXTHTML)
- register_html (u->url, local_file);
- if (*dt & TEXTCSS)
- register_css (u->url, local_file);
- }
+
+ if (*dt & TEXTCSS)
+ register_css (u->url, local_file);
}
if (file)