#include "recur.h"
#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"
textdomain ("wget");
#endif /* HAVE_NLS */
}
-
-/* It's kosher to declare these here because their interface _has_ to
- be void foo(void). */
-void host_init PARAMS ((void));
-
-/* This just calls the various initialization functions from the
- modules that need one-time initialization. */
-static void
-private_initialize (void)
-{
- host_init ();
-}
\f
/* Print the usage message. */
static void
-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\
-T, --timeout=SECONDS set the read timeout to SECONDS.\n\
-w, --wait=SECONDS wait SECONDS between retrievals.\n\
--waitretry=SECONDS wait 1...SECONDS between retries of a retrieval.\n\
+ --random-wait wait from 0...2*WAIT secs between retrievals.\n\
-Y, --proxy=on/off turn proxy on or off.\n\
-Q, --quota=NUMBER set retrieval quota to NUMBER.\n\
+ --limit-rate=RATE limit download rate to RATE.\n\
\n"), stdout);
fputs (_("\
Directories:\n\
{
char **url, **t;
int i, c, nurl, status, append_to_log;
- int wr = 0;
static struct option long_options[] =
{
{ "passive-ftp", no_argument, NULL, 139 },
{ "page-requisites", no_argument, NULL, 'p' },
{ "quiet", no_argument, NULL, 'q' },
+ { "random-wait", no_argument, NULL, 165 },
{ "recursive", no_argument, NULL, 'r' },
{ "relative", no_argument, NULL, 'L' },
{ "retr-symlinks", no_argument, NULL, 137 },
{ "include-directories", required_argument, NULL, 'I' },
{ "input-file", required_argument, NULL, 'i' },
{ "level", required_argument, NULL, 'l' },
+ { "limit-rate", required_argument, NULL, 164 },
{ "load-cookies", required_argument, NULL, 161 },
{ "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 },
};
i18n_initialize ();
- private_initialize ();
append_to_log = 0;
case 149:
setval ("removelisting", "off");
break;
- case 150:
- setval ("simplehostcheck", "on");
- break;
case 155:
setval ("bindaddress", optarg);
break;
case 156:
setval ("httpkeepalive", "off");
break;
+ case 165:
+ setval ("randomwait", "on");
+ break;
case 'b':
setval ("background", "on");
break;
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\
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 164:
+ setval ("limitrate", optarg);
+ break;
case 157:
setval ("referer", optarg);
break;
break;
case 'n':
{
- /* #### The n? options are utter crock! */
+ /* #### What we really want here is --no-foo. */
char *p;
for (p = optarg; *p; p++)
case 'v':
setval ("verbose", "off");
break;
- case 'h':
- setval ("simplehostcheck", "on");
- break;
case 'H':
setval ("addhostdir", "off");
break;
}
}
+ /* Initialize progress. Have to do this after the options are
+ processed so we know where the log file is. */
+ if (opt.verbose)
+ set_progress_implementation (opt.progress_type);
+
/* All user options have now been processed, so it's now safe to do
interoption dependency checks. */
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 *irix4_cc_needs_this;
- STRDUP_ALLOCA (irix4_cc_needs_this, argv[optind]);
- url[i] = irix4_cc_needs_this;
+ char *rewritten = rewrite_shorthand_url (argv[optind]);
+ if (rewritten)
+ {
+ printf ("Converted %s to %s\n", argv[optind], rewritten);
+ url[i] = rewritten;
+ }
+ else
+ url[i] = xstrdup (argv[optind]);
}
url[i] = NULL;
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 */
- recursive_reset ();
+ /*recursive_reset ();*/
/* Retrieve the URLs from argument list. */
for (t = url; *t; t++)
{
- char *filename, *redirected_URL;
+ char *filename = NULL, *redirected_URL = NULL;
int dt;
- status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
- if (opt.recursive && status == RETROK && (dt & TEXTHTML))
- status = recursive_retrieve (filename,
- redirected_URL ? redirected_URL : *t);
+ if (opt.recursive && url_scheme (*t) != SCHEME_FTP)
+ status = retrieve_tree (*t);
+ else
+ status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
if (opt.delete_after && file_exists_p(filename))
{
{
convert_all_links ();
}
+
log_close ();
+ for (i = 0; i < nurl; 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)
{