/* File retrieval.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
This file is part of GNU Wget.
#include <string.h>
#include <assert.h>
+#include "exits.h"
#include "utils.h"
#include "retr.h"
#include "progress.h"
static int
write_data (FILE *out, const char *buf, int bufsize, wgint *skip,
- wgint *written, int flags)
+ wgint *written)
{
- static int cr_pending = 0; /* Found CR in ASCII FTP data. */
-
if (!out)
return 1;
if (*skip > bufsize)
return 1;
}
-/* Note: This code assumes that "\n" is the universal line ending
- character, as on UNIX and VMS. If this is not true, then here's
- where to change it.
-*/
-
-#if 1
-# define EOL_STRING "\n"
-#else /* 1 */
-# define EOL_STRING "\r\n"
-#endif /* 1 [else] */
-#define EOL_STRING_LEN (sizeof( EOL_STRING)- 1)
-
- if (flags & rb_ftp_ascii)
- {
- const char *bufend;
-
- /* ASCII transfer. Put out lines delimited by CRLF. */
- bufend = buf+ bufsize;
- while (buf < bufend)
- {
- /* If CR, put out any pending CR, then set CR-pending flag. */
- if (*buf == '\r')
- {
- if (cr_pending)
- {
- fwrite ("\r", 1, 1, out);
- *written += 1;
- }
- cr_pending = 1;
- buf++;
- continue;
- }
-
- if (cr_pending)
- {
- if (*buf == '\n')
- {
- /* Found FTP EOL (CRLF). Put out local EOL. */
- fwrite (EOL_STRING, 1, EOL_STRING_LEN, out);
- *written += EOL_STRING_LEN;
- }
- else
- {
- /* Normal character. Put out pending CR and it. */
- fwrite ("\r", 1, 1, out);
- fwrite (buf, 1, 1, out);
- *written += 2;
- }
- buf++;
- cr_pending = 0;
- }
- else
- {
- /* Normal character. Put it out. */
- fwrite (buf, 1, 1, out);
- *written += 1;
- buf++;
- }
- }
- }
- else
- {
- /* Image transfer. Put out buffer. */
- fwrite (buf, 1, bufsize, out);
- *written += bufsize;
- }
+ fwrite (buf, 1, bufsize, out);
+ *written += bufsize;
/* Immediately flush the downloaded data. This should not hinder
performance: fast downloads will arrive in large 16K chunks
else if (ret <= 0)
break; /* EOF or read error */
- if (progress || opt.limit_rate)
+ if (progress || opt.limit_rate || elapsed)
{
ptimer_measure (timer);
if (ret > 0)
if (ret > 0)
{
sum_read += ret;
- if (!write_data (out, dlbuf, ret, &skip, &sum_written, flags))
+ if (!write_data (out, dlbuf, ret, &skip, &sum_written))
{
ret = -2;
goto out;
uerr_t
retrieve_url (struct url * orig_parsed, const char *origurl, char **file,
char **newloc, const char *refurl, int *dt, bool recursive,
- struct iri *iri)
+ struct iri *iri, bool register_status)
{
uerr_t result;
char *url;
xfree (url);
xfree (error);
RESTORE_POST_DATA;
- return PROXERR;
+ result = PROXERR;
+ goto bail;
}
if (proxy_url->scheme != SCHEME_HTTP && proxy_url->scheme != u->scheme)
{
url_free (proxy_url);
xfree (url);
RESTORE_POST_DATA;
- return PROXERR;
+ result = PROXERR;
+ goto bail;
}
}
if (redirection_count)
oldrec = glob = false;
- result = ftp_loop (u, dt, proxy_url, recursive, glob);
+ result = ftp_loop (u, &local_file, dt, proxy_url, recursive, glob);
recursive = oldrec;
/* There is a possibility of having HTTP being redirected to
xfree (mynewloc);
xfree (error);
RESTORE_POST_DATA;
- return result;
+ goto bail;
}
/* Now mynewloc will become newloc_parsed->url, because if the
xfree (url);
xfree (mynewloc);
RESTORE_POST_DATA;
- return WRONGCODE;
+ result = WRONGCODE;
+ goto bail;
}
xfree (url);
RESTORE_POST_DATA;
+bail:
+ if (register_status)
+ inform_exit_status (result);
return result;
}
struct urlpos *url_list, *cur_url;
struct iri *iri = iri_new();
- char *input_file = NULL;
+ char *input_file, *url_file = NULL;
const char *url = file;
status = RETROK; /* Suppose everything is OK. */
set_uri_encoding (iri, opt.locale, true);
set_content_encoding (iri, opt.locale);
- if (url_has_scheme (url))
+ if (url_valid_scheme (url))
{
int dt,url_err;
uerr_t status;
if (!opt.base_href)
opt.base_href = xstrdup (url);
- status = retrieve_url (url_parsed, url, &input_file, NULL, NULL, &dt,
- false, iri);
- if (status != RETROK)
+ status = retrieve_url (url_parsed, url, &url_file, NULL, NULL, &dt,
+ false, iri, true);
+ url_free (url_parsed);
+
+ if (!url_file || (status != RETROK))
return status;
if (dt & TEXTHTML)
iri->utf8_encode = opt.enable_iri;
xfree_null (iri->orig_url);
iri->orig_url = NULL;
+
+ input_file = url_file;
}
else
input_file = (char *) file;
url_list = (html ? get_urls_html (input_file, NULL, NULL, iri)
: get_urls_file (input_file));
+ xfree_null (url_file);
+
for (cur_url = url_list; cur_url; cur_url = cur_url->next, ++*count)
{
char *filename = NULL, *new_file = NULL;
else
status = retrieve_url (parsed_url ? parsed_url : cur_url->url,
cur_url->url->url, &filename,
- &new_file, NULL, &dt, opt.recursive, tmpiri);
+ &new_file, NULL, &dt, opt.recursive, tmpiri,
+ true);
if (parsed_url)
url_free (parsed_url);
else
*file = default_file;
}
+
+/* Return true for an input file's own URL, false otherwise. */
+bool
+input_file_url (const char *input_file)
+{
+ static bool first = true;
+
+ if (input_file
+ && url_has_scheme (input_file)
+ && first)
+ {
+ first = false;
+ return true;
+ }
+ else
+ return false;
+}
projects / wget / blobdiff