X-Git-Url: http://sjero.net/git/?a=blobdiff_plain;f=src%2Fmain.c;h=4c1a70e2ecee982f919bde0d53220dba920ac404;hb=d905504a0af1f808ead87bf6877dafaf6ff6aef8;hp=51209a66071a23e5b28de9fb0900904e7fdf83a9;hpb=db9de5b07563e2f5d1e14a92f2cda4137cc2fb8a;p=wget
diff --git a/src/main.c b/src/main.c
index 51209a66..4c1a70e2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,12 @@
/* Command line parsing.
- Copyright (C) 1996-2005 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+ 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Wget.
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
+the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
GNU Wget is distributed in the hope that it will be useful,
@@ -14,8 +15,7 @@ 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 Wget; if not, write to the Free Software Foundation, Inc.,
-51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+along with Wget. If not, see .
In addition, as a special exception, the Free Software Foundation
gives permission to link the code of its release of Wget with the
@@ -36,11 +36,12 @@ so, delete this exception statement from your version. */
#endif /* HAVE_UNISTD_H */
#include
#include
-#ifdef HAVE_NLS
+#ifdef ENABLE_NLS
# include
#endif
#include
#include
+#include
#include "wget.h"
#include "utils.h"
@@ -49,12 +50,12 @@ so, delete this exception statement from your version. */
#include "recur.h"
#include "host.h"
#include "url.h"
-#include "progress.h" /* for progress_handle_sigwinch */
+#include "progress.h" /* for progress_handle_sigwinch */
#include "convert.h"
-#include "http.h" /* for save_cookies */
+#include "spider.h"
+#include "http.h" /* for save_cookies */
-/* On GNU system this will include system-wide getopt.h. */
-#include "getopt.h"
+#include
#ifndef PATH_SEPARATOR
# define PATH_SEPARATOR '/'
@@ -70,6 +71,7 @@ static void redirect_output_signal (int);
const char *exec_name;
+#ifndef TESTING
/* Initialize I18N/L10N. That amounts to invoking setlocale, and
setting up gettext's message catalog using bindtextdomain and
textdomain. Does nothing if NLS is disabled or missing. */
@@ -77,14 +79,14 @@ const char *exec_name;
static void
i18n_initialize (void)
{
- /* HAVE_NLS implies existence of functions invoked here. */
-#ifdef HAVE_NLS
+ /* ENABLE_NLS implies existence of functions invoked here. */
+#ifdef ENABLE_NLS
/* Set the current locale. */
setlocale (LC_ALL, "");
/* Set the text message domain. */
bindtextdomain ("wget", LOCALEDIR);
textdomain ("wget");
-#endif /* HAVE_NLS */
+#endif /* ENABLE_NLS */
}
/* Definition of command-line options. */
@@ -120,8 +122,8 @@ struct cmdline_option {
OPT__NO,
OPT__PARENT
} type;
- const void *data; /* for standard options */
- int argtype; /* for non-standard options */
+ const void *data; /* for standard options */
+ int argtype; /* for non-standard options */
};
static struct cmdline_option option_data[] =
@@ -143,6 +145,7 @@ static struct cmdline_option option_data[] =
{ "connect-timeout", 0, OPT_VALUE, "connecttimeout", -1 },
{ "continue", 'c', OPT_BOOLEAN, "continue", -1 },
{ "convert-links", 'k', OPT_BOOLEAN, "convertlinks", -1 },
+ { "content-disposition", 0, OPT_BOOLEAN, "contentdisposition", -1 },
{ "cookies", 0, OPT_BOOLEAN, "cookies", -1 },
{ "cut-dirs", 0, OPT_VALUE, "cutdirs", -1 },
{ WHEN_DEBUG ("debug"), 'd', OPT_BOOLEAN, "debug", -1 },
@@ -174,6 +177,7 @@ static struct cmdline_option option_data[] =
{ "http-passwd", 0, OPT_VALUE, "httppassword", -1 }, /* deprecated */
{ "http-password", 0, OPT_VALUE, "httppassword", -1 },
{ "http-user", 0, OPT_VALUE, "httpuser", -1 },
+ { "ignore-case", 0, OPT_BOOLEAN, "ignorecase", -1 },
{ "ignore-length", 0, OPT_BOOLEAN, "ignorelength", -1 },
{ "ignore-tags", 0, OPT_VALUE, "ignoretags", -1 },
{ "include-directories", 'I', OPT_VALUE, "includedirectories", -1 },
@@ -186,6 +190,7 @@ static struct cmdline_option option_data[] =
{ "level", 'l', OPT_VALUE, "reclevel", -1 },
{ "limit-rate", 0, OPT_VALUE, "limitrate", -1 },
{ "load-cookies", 0, OPT_VALUE, "loadcookies", -1 },
+ { "max-redirect", 0, OPT_VALUE, "maxredirect", -1 },
{ "mirror", 'm', OPT_BOOLEAN, "mirror", -1 },
{ "no", 'n', OPT__NO, NULL, required_argument },
{ "no-clobber", 0, OPT_BOOLEAN, "noclobber", -1 },
@@ -239,6 +244,9 @@ static struct cmdline_option option_data[] =
{ "version", 'V', OPT_FUNCALL, (void *) print_version, no_argument },
{ "wait", 'w', OPT_VALUE, "wait", -1 },
{ "waitretry", 0, OPT_VALUE, "waitretry", -1 },
+#ifdef MSDOS
+ { "wdebug", 0, OPT_BOOLEAN, "wdebug", -1 },
+#endif
};
#undef WHEN_DEBUG
@@ -289,51 +297,51 @@ init_switches (void)
struct option *longopt;
if (!opt->long_name)
- /* The option is disabled. */
- continue;
+ /* The option is disabled. */
+ continue;
longopt = &long_options[o++];
longopt->name = opt->long_name;
longopt->val = i;
if (opt->short_name)
- {
- *p++ = opt->short_name;
- optmap[opt->short_name - 32] = longopt - long_options;
- }
+ {
+ *p++ = opt->short_name;
+ optmap[opt->short_name - 32] = longopt - long_options;
+ }
switch (opt->type)
- {
- case OPT_VALUE:
- longopt->has_arg = required_argument;
+ {
+ case OPT_VALUE:
+ longopt->has_arg = required_argument;
+ if (opt->short_name)
+ *p++ = ':';
+ break;
+ case OPT_BOOLEAN:
+ /* Specify an optional argument for long options, so that
+ --option=off works the same as --no-option, for
+ compatibility with pre-1.10 Wget. However, don't specify
+ optional arguments short-option booleans because they
+ prevent combining of short options. */
+ longopt->has_arg = optional_argument;
+ /* For Boolean options, add the "--no-FOO" variant, which is
+ identical to "--foo", except it has opposite meaning and
+ it doesn't allow an argument. */
+ longopt = &long_options[o++];
+ longopt->name = no_prefix (opt->long_name);
+ longopt->has_arg = no_argument;
+ /* Mask the value so we'll be able to recognize that we're
+ dealing with the false value. */
+ longopt->val = i | BOOLEAN_NEG_MARKER;
+ break;
+ default:
+ assert (opt->argtype != -1);
+ longopt->has_arg = opt->argtype;
if (opt->short_name)
- *p++ = ':';
- break;
- case OPT_BOOLEAN:
- /* Specify an optional argument for long options, so that
- --option=off works the same as --no-option, for
- compatibility with pre-1.10 Wget. However, don't specify
- optional arguments short-option booleans because they
- prevent combining of short options. */
- longopt->has_arg = optional_argument;
- /* For Boolean options, add the "--no-FOO" variant, which is
- identical to "--foo", except it has opposite meaning and
- it doesn't allow an argument. */
- longopt = &long_options[o++];
- longopt->name = no_prefix (opt->long_name);
- longopt->has_arg = no_argument;
- /* Mask the value so we'll be able to recognize that we're
- dealing with the false value. */
- longopt->val = i | BOOLEAN_NEG_MARKER;
- break;
- default:
- assert (opt->argtype != -1);
- longopt->has_arg = opt->argtype;
- if (opt->short_name)
- {
- if (longopt->has_arg == required_argument)
- *p++ = ':';
- /* Don't handle optional_argument */
- }
- }
+ {
+ if (longopt->has_arg == required_argument)
+ *p++ = ':';
+ /* Don't handle optional_argument */
+ }
+ }
}
/* Terminate short_options. */
*p = '\0';
@@ -381,6 +389,10 @@ Logging and input file:\n"),
#ifdef ENABLE_DEBUG
N_("\
-d, --debug print lots of debugging information.\n"),
+#endif
+#ifdef MSDOS
+ N_("\
+ --wdebug print Watt-32 debug output.\n"),
#endif
N_("\
-q, --quiet quiet (no output).\n"),
@@ -446,6 +458,8 @@ Download:\n"),
--no-dns-cache disable caching DNS lookups.\n"),
N_("\
--restrict-file-names=OS restrict chars in file names to ones OS allows.\n"),
+ N_("\
+ --ignore-case ignore case when matching files/directories.\n"),
#ifdef ENABLE_IPV6
N_("\
-4, --inet4-only connect only to IPv4 addresses.\n"),
@@ -491,6 +505,8 @@ HTTP options:\n"),
--ignore-length ignore `Content-Length' header field.\n"),
N_("\
--header=STRING insert STRING among the headers.\n"),
+ N_("\
+ --max-redirect maximum redirections allowed per page.\n"),
N_("\
--proxy-user=USER set USER as proxy username.\n"),
N_("\
@@ -515,6 +531,8 @@ HTTP options:\n"),
--post-data=STRING use the POST method; send STRING as the data.\n"),
N_("\
--post-file=FILE use the POST method; send contents of FILE.\n"),
+ N_("\
+ --no-content-disposition don't honor Content-Disposition header.\n"),
"\n",
#ifdef HAVE_SSL
@@ -616,7 +634,7 @@ Recursive accept/reject:\n"),
int i;
printf (_("GNU Wget %s, a non-interactive network retriever.\n"),
- version_string);
+ version_string);
print_usage ();
for (i = 0; i < countof (help); i++)
@@ -656,17 +674,20 @@ print_version (void)
{
printf ("GNU Wget %s\n\n", version_string);
fputs (_("\
-Copyright (C) 2005 Free Software Foundation, Inc.\n"), stdout);
+Copyright (C) 2007 Free Software Foundation, Inc.\n"), stdout);
fputs (_("\
-This program is distributed in the hope that it will be useful,\n\
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n\
-GNU General Public License for more details.\n"), stdout);
+License GPLv3+: GNU GPL version 3 or later\n\
+.\n\
+This is free software: you are free to change and redistribute it.\n\
+There is NO WARRANTY, to the extent permitted by law.\n"), stdout);
fputs (_("\nOriginally written by Hrvoje Niksic .\n"),
- stdout);
+ stdout);
+ fputs (_("Currently maintained by Micah Cowan .\n"),
+ stdout);
exit (0);
}
+
int
main (int argc, char *const *argv)
{
@@ -686,7 +707,7 @@ main (int argc, char *const *argv)
#ifdef WINDOWS
/* Drop extension (typically .EXE) from executable filename. */
- windows_main (&argc, (char **) argv, (char **) &exec_name);
+ windows_main ((char **) &exec_name);
#endif
/* Set option defaults; read the system wgetrc and ~/.wgetrc. */
@@ -695,130 +716,135 @@ main (int argc, char *const *argv)
init_switches ();
longindex = -1;
while ((ret = getopt_long (argc, argv,
- short_options, long_options, &longindex)) != -1)
+ short_options, long_options, &longindex)) != -1)
{
int val;
struct cmdline_option *opt;
/* If LONGINDEX is unchanged, it means RET is referring a short
- option. */
+ option. */
if (longindex == -1)
- {
- if (ret == '?')
- {
- print_usage ();
- printf ("\n");
- printf (_("Try `%s --help' for more options.\n"), exec_name);
- exit (2);
- }
- /* Find the short option character in the mapping. */
- longindex = optmap[ret - 32];
- }
+ {
+ if (ret == '?')
+ {
+ print_usage ();
+ printf ("\n");
+ printf (_("Try `%s --help' for more options.\n"), exec_name);
+ exit (2);
+ }
+ /* Find the short option character in the mapping. */
+ longindex = optmap[ret - 32];
+ }
val = long_options[longindex].val;
/* Use the retrieved value to locate the option in the
- option_data array, and to see if we're dealing with the
- negated "--no-FOO" variant of the boolean option "--foo". */
+ option_data array, and to see if we're dealing with the
+ negated "--no-FOO" variant of the boolean option "--foo". */
opt = &option_data[val & ~BOOLEAN_NEG_MARKER];
switch (opt->type)
- {
- case OPT_VALUE:
- setoptval (opt->data, optarg, opt->long_name);
- break;
- case OPT_BOOLEAN:
- if (optarg)
- /* The user has specified a value -- use it. */
- setoptval (opt->data, optarg, opt->long_name);
- else
- {
- /* NEG is true for `--no-FOO' style boolean options. */
- bool neg = !!(val & BOOLEAN_NEG_MARKER);
- setoptval (opt->data, neg ? "0" : "1", opt->long_name);
- }
- break;
- case OPT_FUNCALL:
- {
- void (*func) (void) = (void (*) (void)) opt->data;
- func ();
- }
- break;
- case OPT__APPEND_OUTPUT:
- setoptval ("logfile", optarg, opt->long_name);
- append_to_log = true;
- break;
- case OPT__EXECUTE:
- run_command (optarg);
- break;
- case OPT__NO:
- {
- /* We support real --no-FOO flags now, but keep these
- short options for convenience and backward
- compatibility. */
- char *p;
- for (p = optarg; *p; p++)
- switch (*p)
- {
- case 'v':
- setoptval ("verbose", "0", opt->long_name);
- break;
- case 'H':
- setoptval ("addhostdir", "0", opt->long_name);
- break;
- case 'd':
- setoptval ("dirstruct", "0", opt->long_name);
- break;
- case 'c':
- setoptval ("noclobber", "1", opt->long_name);
- break;
- case 'p':
- setoptval ("noparent", "1", opt->long_name);
- break;
- default:
- printf (_("%s: illegal option -- `-n%c'\n"), exec_name, *p);
- print_usage ();
- printf ("\n");
- printf (_("Try `%s --help' for more options.\n"), exec_name);
- exit (1);
- }
- break;
- }
- case OPT__PARENT:
- case OPT__CLOBBER:
- {
- /* The wgetrc commands are named noparent and noclobber,
- so we must revert the meaning of the cmdline options
- before passing the value to setoptval. */
- bool flag = true;
- if (optarg)
- flag = (*optarg == '1' || TOLOWER (*optarg) == 'y'
- || (TOLOWER (optarg[0]) == 'o'
- && TOLOWER (optarg[1]) == 'n'));
- setoptval (opt->type == OPT__PARENT ? "noparent" : "noclobber",
- flag ? "0" : "1", opt->long_name);
- break;
- }
- case OPT__DONT_REMOVE_LISTING:
- setoptval ("removelisting", "0", opt->long_name);
- break;
- }
+ {
+ case OPT_VALUE:
+ setoptval (opt->data, optarg, opt->long_name);
+ break;
+ case OPT_BOOLEAN:
+ if (optarg)
+ /* The user has specified a value -- use it. */
+ setoptval (opt->data, optarg, opt->long_name);
+ else
+ {
+ /* NEG is true for `--no-FOO' style boolean options. */
+ bool neg = !!(val & BOOLEAN_NEG_MARKER);
+ setoptval (opt->data, neg ? "0" : "1", opt->long_name);
+ }
+ break;
+ case OPT_FUNCALL:
+ {
+ void (*func) (void) = (void (*) (void)) opt->data;
+ func ();
+ }
+ break;
+ case OPT__APPEND_OUTPUT:
+ setoptval ("logfile", optarg, opt->long_name);
+ append_to_log = true;
+ break;
+ case OPT__EXECUTE:
+ run_command (optarg);
+ break;
+ case OPT__NO:
+ {
+ /* We support real --no-FOO flags now, but keep these
+ short options for convenience and backward
+ compatibility. */
+ char *p;
+ for (p = optarg; *p; p++)
+ switch (*p)
+ {
+ case 'v':
+ setoptval ("verbose", "0", opt->long_name);
+ break;
+ case 'H':
+ setoptval ("addhostdir", "0", opt->long_name);
+ break;
+ case 'd':
+ setoptval ("dirstruct", "0", opt->long_name);
+ break;
+ case 'c':
+ setoptval ("noclobber", "1", opt->long_name);
+ break;
+ case 'p':
+ setoptval ("noparent", "1", opt->long_name);
+ break;
+ default:
+ printf (_("%s: illegal option -- `-n%c'\n"), exec_name, *p);
+ print_usage ();
+ printf ("\n");
+ printf (_("Try `%s --help' for more options.\n"), exec_name);
+ exit (1);
+ }
+ break;
+ }
+ case OPT__PARENT:
+ case OPT__CLOBBER:
+ {
+ /* The wgetrc commands are named noparent and noclobber,
+ so we must revert the meaning of the cmdline options
+ before passing the value to setoptval. */
+ bool flag = true;
+ if (optarg)
+ flag = (*optarg == '1' || c_tolower (*optarg) == 'y'
+ || (c_tolower (optarg[0]) == 'o'
+ && c_tolower (optarg[1]) == 'n'));
+ setoptval (opt->type == OPT__PARENT ? "noparent" : "noclobber",
+ flag ? "0" : "1", opt->long_name);
+ break;
+ }
+ case OPT__DONT_REMOVE_LISTING:
+ setoptval ("removelisting", "0", opt->long_name);
+ break;
+ }
longindex = -1;
}
+ nurl = argc - optind;
+
/* All user options have now been processed, so it's now safe to do
interoption dependency checks. */
if (opt.reclevel == 0)
- opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary on this */
+ opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary */
+
+ if (opt.spider || opt.delete_after)
+ opt.no_dirstruct = true;
if (opt.page_requisites && !opt.recursive)
{
/* Don't set opt.recursive here because it would confuse the FTP
- code. Instead, call retrieve_tree below when either
- page_requisites or recursive is requested. */
+ code. Instead, call retrieve_tree below when either
+ page_requisites or recursive is requested. */
opt.reclevel = 0;
if (!opt.no_dirstruct)
- opt.dirstruct = 1; /* normally handled by cmd_spec_recursive() */
+ opt.dirstruct = 1; /* normally handled by cmd_spec_recursive() */
}
if (opt.verbose == -1)
@@ -846,8 +872,24 @@ Can't timestamp and not clobber old files at the same time.\n"));
exit (1);
}
#endif
+ if (opt.output_document
+ && (opt.page_requisites
+ || opt.recursive
+ || opt.timestamping))
+ {
+ printf (_("Cannot specify -r, -p or -N if -O is given.\n"));
+ print_usage ();
+ exit (1);
+ }
+ if (opt.output_document
+ && opt.convert_links
+ && nurl > 1)
+ {
+ printf (_("Cannot specify both -k and -O if multiple URLs are given.\n"));
+ print_usage ();
+ exit (1);
+ }
- nurl = argc - optind;
if (!nurl && !opt.input_filename)
{
/* No URL specified. */
@@ -855,13 +897,19 @@ Can't timestamp and not clobber old files at the same time.\n"));
print_usage ();
printf ("\n");
/* #### Something nicer should be printed here -- similar to the
- pre-1.5 `--help' page. */
+ pre-1.5 `--help' page. */
printf (_("Try `%s --help' for more options.\n"), exec_name);
exit (1);
}
+#ifdef MSDOS
+ if (opt.wdebug)
+ dbug_init();
+ sock_init();
+#else
if (opt.background)
fork_to_background ();
+#endif
/* Initialize progress. Have to do this after the options are
processed so we know where the log file is. */
@@ -874,9 +922,9 @@ Can't timestamp and not clobber old files at the same time.\n"));
{
char *rewritten = rewrite_shorthand_url (argv[optind]);
if (rewritten)
- url[i] = rewritten;
+ url[i] = rewritten;
else
- url[i] = xstrdup (argv[optind]);
+ url[i] = xstrdup (argv[optind]);
}
url[i] = NULL;
@@ -884,26 +932,26 @@ Can't timestamp and not clobber old files at the same time.\n"));
log_init (opt.lfilename, append_to_log);
DEBUGP (("DEBUG output created by Wget %s on %s.\n\n", version_string,
- OS_TYPE));
+ OS_TYPE));
/* Open the output filename if necessary. */
if (opt.output_document)
{
if (HYPHENP (opt.output_document))
- output_stream = stdout;
+ output_stream = stdout;
else
- {
- struct_fstat st;
- output_stream = fopen (opt.output_document,
- opt.always_rest ? "ab" : "wb");
- if (output_stream == NULL)
- {
- perror (opt.output_document);
- exit (1);
- }
- if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
- output_stream_regular = true;
- }
+ {
+ struct_fstat st;
+ output_stream = fopen (opt.output_document,
+ opt.always_rest ? "ab" : "wb");
+ if (output_stream == NULL)
+ {
+ perror (opt.output_document);
+ exit (1);
+ }
+ if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
+ output_stream_regular = true;
+ }
}
#ifdef WINDOWS
@@ -930,7 +978,7 @@ Can't timestamp and not clobber old files at the same time.\n"));
signal (SIGWINCH, progress_handle_sigwinch);
#endif
- status = RETROK; /* initialize it, just-in-case */
+ status = RETROK; /* initialize it, just-in-case */
/* Retrieve the URLs from argument list. */
for (t = url; *t; t++)
{
@@ -938,18 +986,28 @@ Can't timestamp and not clobber old files at the same time.\n"));
int dt;
if ((opt.recursive || opt.page_requisites)
- && url_scheme (*t) != SCHEME_FTP)
- status = retrieve_tree (*t);
+ && (url_scheme (*t) != SCHEME_FTP || url_uses_proxy (*t)))
+ {
+ int old_follow_ftp = opt.follow_ftp;
+
+ /* Turn opt.follow_ftp on in case of recursive FTP retrieval */
+ if (url_scheme (*t) == SCHEME_FTP)
+ opt.follow_ftp = 1;
+
+ status = retrieve_tree (*t);
+
+ opt.follow_ftp = old_follow_ftp;
+ }
else
- status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
+ status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt, opt.recursive);
if (opt.delete_after && file_exists_p(filename))
- {
- DEBUGP (("Removing file due to --delete-after in main():\n"));
- logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename);
- if (unlink (filename))
- logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
- }
+ {
+ DEBUGP (("Removing file due to --delete-after in main():\n"));
+ logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename);
+ if (unlink (filename))
+ logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+ }
xfree_null (redirected_URL);
xfree_null (filename);
@@ -961,26 +1019,35 @@ Can't timestamp and not clobber old files at the same time.\n"));
int count;
status = retrieve_from_file (opt.input_filename, opt.force_html, &count);
if (!count)
- logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"),
- opt.input_filename);
+ logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"),
+ opt.input_filename);
}
+
+ /* Print broken links. */
+ if (opt.recursive && opt.spider)
+ {
+ print_broken_links();
+ }
+
/* Print the downloaded sum. */
- if (opt.recursive || opt.page_requisites
- || nurl > 1
- || (opt.input_filename && total_downloaded_bytes != 0))
+ if ((opt.recursive || opt.page_requisites
+ || nurl > 1
+ || (opt.input_filename && total_downloaded_bytes != 0))
+ &&
+ total_downloaded_bytes != 0)
{
logprintf (LOG_NOTQUIET,
- _("FINISHED --%s--\nDownloaded: %d files, %s in %s (%s)\n"),
- time_str (NULL),
- opt.numurls,
- human_readable (total_downloaded_bytes),
- secs_to_human_time (total_download_time / 1000),
- retr_rate (total_downloaded_bytes, total_download_time));
+ _("FINISHED --%s--\nDownloaded: %d files, %s in %s (%s)\n"),
+ datetime_str (time (NULL)),
+ opt.numurls,
+ human_readable (total_downloaded_bytes),
+ secs_to_human_time (total_download_time),
+ retr_rate (total_downloaded_bytes, total_download_time));
/* Print quota warning, if exceeded. */
if (opt.quota && total_downloaded_bytes > opt.quota)
- logprintf (LOG_NOTQUIET,
- _("Download quota of %s EXCEEDED!\n"),
- human_readable (opt.quota));
+ logprintf (LOG_NOTQUIET,
+ _("Download quota of %s EXCEEDED!\n"),
+ human_readable (opt.quota));
}
if (opt.cookies_output)
@@ -1002,6 +1069,7 @@ Can't timestamp and not clobber old files at the same time.\n"));
else
return 1;
}
+#endif /* TESTING */
#if defined(SIGHUP) || defined(SIGUSR1)
@@ -1021,10 +1089,14 @@ static void
redirect_output_signal (int sig)
{
const char *signal_name = (sig == SIGHUP ? "SIGHUP" :
- (sig == SIGUSR1 ? "SIGUSR1" :
- "WTF?!"));
+ (sig == SIGUSR1 ? "SIGUSR1" :
+ "WTF?!"));
log_request_redirect_output (signal_name);
progress_schedule_redirect ();
signal (sig, redirect_output_signal);
}
#endif
+
+/*
+ * vim: et ts=2 sw=2
+ */