#include "host.h"
#include "cookies.h"
#include "url.h"
+#include "progress.h" /* for progress_handle_sigwinch */
/* On GNU system this will include system-wide getopt.h. */
#include "getopt.h"
-O --output-document=FILE write documents to FILE.\n\
-nc, --no-clobber don\'t clobber existing files or use .# suffixes.\n\
-c, --continue resume getting a partially-downloaded file.\n\
- --dot-style=STYLE set retrieval display style.\n\
+ --progress=TYPE select progress gauge type.\n\
-N, --timestamping don\'t re-retrieve files unless newer than local.\n\
-S, --server-response print server response.\n\
--spider don\'t download anything.\n\
{
char **url, **t;
int i, c, nurl, status, append_to_log;
- int wr = 0;
static struct option long_options[] =
{
{ "no", required_argument, NULL, 'n' },
{ "output-document", required_argument, NULL, 'O' },
{ "output-file", required_argument, NULL, 'o' },
+ { "progress", required_argument, NULL, 163 },
{ "proxy", required_argument, NULL, 'Y' },
{ "proxy-passwd", required_argument, NULL, 144 },
{ "proxy-user", required_argument, NULL, 143 },
case 'V':
printf ("GNU Wget %s\n\n", version_string);
printf ("%s", _("\
-Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.\n\
+Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.\n"));
+ printf ("%s", _("\
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\
setval ("header", optarg);
break;
case 134:
- setval ("dotstyle", optarg);
+ /* Supported for compatibility; --dot-style=foo equivalent
+ to --progress=dot:foo. */
+ {
+ char *tmp = alloca (3 + 1 + strlen (optarg));
+ sprintf (tmp, "dot:%s", optarg);
+ setval ("progress", tmp);
+ }
break;
case 135:
setval ("htmlify", optarg);
break;
case 152:
setval ("waitretry", optarg);
- wr = 1;
break;
case 153:
setval ("followtags", optarg);
case 162:
setval ("savecookies", optarg);
break;
+ case 163:
+ setval ("progress", optarg);
+ break;
case 157:
setval ("referer", optarg);
break;
if (opt.verbose == -1)
opt.verbose = !opt.quiet;
- /* Retain compatibility with previous scripts.
- if wait has been set, but waitretry has not, give it the wait value.
- A simple check on the values is not enough, I could have set
- wait to n>0 and waitretry to 0 - HEH */
- if (opt.wait && !wr)
- {
- char opt_wait_str[256]; /* bigger than needed buf to prevent overflow */
-
- sprintf(opt_wait_str, "%ld", opt.wait);
- setval ("waitretry", opt_wait_str);
- }
-
/* Sanity checks. */
if (opt.verbose && opt.quiet)
{
/* Fill in the arguments. */
for (i = 0; i < nurl; i++, optind++)
{
- char *rewritten = rewrite_url_maybe (argv[optind]);
+ char *rewritten = rewrite_shorthand_url (argv[optind]);
if (rewritten)
{
printf ("Converted %s to %s\n", argv[optind], rewritten);
process exits. What we want is to ignore SIGPIPE and just check
for the return value of write(). */
signal (SIGPIPE, SIG_IGN);
+#ifdef SIGWINCH
+ signal (SIGWINCH, progress_handle_sigwinch);
+#endif
#endif /* HAVE_SIGNAL */
status = RETROK; /* initialize it, just-in-case */
{
convert_all_links ();
}
+
log_close ();
for (i = 0; i < nurl; i++)
- free (url[i]);
+ xfree (url[i]);
cleanup ();
+
#ifdef DEBUG_MALLOC
print_malloc_debug_stats ();
#endif
return 1;
}
\f
+#ifdef HAVE_SIGNAL
/* Hangup signal handler. When wget receives SIGHUP or SIGUSR1, it
will proceed operation as usual, trying to write into a log file.
If that is impossible, the output will be turned off. */
-#ifdef HAVE_SIGNAL
static RETSIGTYPE
redirect_output_signal (int sig)
{