/* Command line parsing.
- Copyright (C) 2003 Free Software Foundation, Inc.
+ Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of GNU Wget.
#include "retr.h"
#include "recur.h"
#include "host.h"
-#include "cookies.h"
#include "url.h"
#include "progress.h" /* for progress_handle_sigwinch */
#include "convert.h"
main(). */
OPT__APPEND_OUTPUT,
OPT__CLOBBER,
+ OPT__DONT_REMOVE_LISTING,
OPT__EXECUTE,
OPT__NO,
OPT__PARENT,
} type;
- void *data; /* for standard options */
+ const void *data; /* for standard options */
int argtype; /* for non-standard options */
};
{ "backups", 0, OPT_BOOLEAN, "backups", -1 },
{ "base", 'B', OPT_VALUE, "base", -1 },
{ "bind-address", 0, OPT_VALUE, "bindaddress", -1 },
- { "cache", 'C', OPT_BOOLEAN, "cache", -1 },
+ { IF_SSL ("ca-certificate"), 0, OPT_VALUE, "cacertificate", -1 },
+ { IF_SSL ("ca-directory"), 0, OPT_VALUE, "cadirectory", -1 },
+ { "cache", 0, OPT_BOOLEAN, "cache", -1 },
+ { IF_SSL ("certificate"), 0, OPT_VALUE, "certificate", -1 },
+ { IF_SSL ("certificate-type"), 0, OPT_VALUE, "certificatetype", -1 },
+ { IF_SSL ("check-certificate"), 0, OPT_BOOLEAN, "checkcertificate", -1 },
{ "clobber", 0, OPT__CLOBBER, NULL, optional_argument },
{ "connect-timeout", 0, OPT_VALUE, "connecttimeout", -1 },
{ "continue", 'c', OPT_BOOLEAN, "continue", -1 },
{ "dns-cache", 0, OPT_BOOLEAN, "dnscache", -1 },
{ "dns-timeout", 0, OPT_VALUE, "dnstimeout", -1 },
{ "domains", 'D', OPT_VALUE, "domains", -1 },
+ { "dont-remove-listing", 0, OPT__DONT_REMOVE_LISTING, NULL, no_argument },
{ "dot-style", 0, OPT_VALUE, "dotstyle", -1 },
{ "egd-file", 0, OPT_VALUE, "egdfile", -1 },
{ "exclude-directories", 'X', OPT_VALUE, "excludedirectories", -1 },
{ "follow-tags", 0, OPT_VALUE, "followtags", -1 },
{ "force-directories", 'x', OPT_BOOLEAN, "dirstruct", -1 },
{ "force-html", 'F', OPT_BOOLEAN, "forcehtml", -1 },
- { "glob", 'g', OPT_BOOLEAN, "glob", -1 },
+ { "ftp-passwd", 0, OPT_VALUE, "ftppasswd", -1 },
+ { "glob", 0, OPT_BOOLEAN, "glob", -1 },
{ "header", 0, OPT_VALUE, "header", -1 },
{ "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },
{ "host-directories", 0, OPT_BOOLEAN, "addhostdir", -1 },
{ "http-passwd", 0, OPT_VALUE, "httppasswd", -1 },
{ "http-user", 0, OPT_VALUE, "httpuser", -1 },
{ "ignore-length", 0, OPT_BOOLEAN, "ignorelength", -1 },
- { "ignore-tags", 'G', OPT_VALUE, "ignoretags", -1 },
+ { "ignore-tags", 0, OPT_VALUE, "ignoretags", -1 },
{ "include-directories", 'I', OPT_VALUE, "includedirectories", -1 },
+#ifdef ENABLE_IPV6
+ { "inet4-only", '4', OPT_BOOLEAN, "inet4only", -1 },
+ { "inet6-only", '6', OPT_BOOLEAN, "inet6only", -1 },
+#endif
{ "input-file", 'i', OPT_VALUE, "input", -1 },
{ "keep-session-cookies", 0, OPT_BOOLEAN, "keepsessioncookies", -1 },
{ "level", 'l', OPT_VALUE, "reclevel", -1 },
{ "limit-rate", 0, OPT_VALUE, "limitrate", -1 },
{ "load-cookies", 0, OPT_VALUE, "loadcookies", -1 },
- { "mirror", 'm', OPT_BOOLEAN, NULL, -1 },
+ { "mirror", 'm', OPT_BOOLEAN, "mirror", -1 },
{ "no", 'n', OPT__NO, NULL, required_argument },
{ "no-clobber", 0, OPT_BOOLEAN, "noclobber", -1 },
{ "no-parent", 0, OPT_BOOLEAN, "noparent", -1 },
{ "passive-ftp", 0, OPT_BOOLEAN, "passiveftp", -1 },
{ "post-data", 0, OPT_VALUE, "postdata", -1 },
{ "post-file", 0, OPT_VALUE, "postfile", -1 },
+ { "prefer-family", 0, OPT_VALUE, "preferfamily", -1 },
{ "preserve-permissions", 0, OPT_BOOLEAN, "preservepermissions", -1 },
+ { IF_SSL ("private-key"), 0, OPT_VALUE, "privatekey", -1 },
+ { IF_SSL ("private-key-type"), 0, OPT_VALUE, "privatekeytype", -1 },
{ "progress", 0, OPT_VALUE, "progress", -1 },
- { "proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 },
+ { "protocol-directories", 0, OPT_BOOLEAN, "protocoldirectories", -1 },
+ { "proxy", 0, OPT_BOOLEAN, "useproxy", -1 },
+ { "proxy__compat", 'Y', OPT_VALUE, "useproxy", -1 }, /* back-compatible */
{ "proxy-passwd", 0, OPT_VALUE, "proxypasswd", -1 },
{ "proxy-user", 0, OPT_VALUE, "proxyuser", -1 },
{ "quiet", 'q', OPT_BOOLEAN, "quiet", -1 },
{ "quota", 'Q', OPT_VALUE, "quota", -1 },
+ { "random-file", 0, OPT_VALUE, "randomfile", -1 },
{ "random-wait", 0, OPT_BOOLEAN, "randomwait", -1 },
{ "read-timeout", 0, OPT_VALUE, "readtimeout", -1 },
{ "recursive", 'r', OPT_BOOLEAN, "recursive", -1 },
{ "retry-connrefused", 0, OPT_BOOLEAN, "retryconnrefused", -1 },
{ "save-cookies", 0, OPT_VALUE, "savecookies", -1 },
{ "save-headers", 0, OPT_BOOLEAN, "saveheaders", -1 },
+ { IF_SSL ("secure-protocol"), 0, OPT_VALUE, "secureprotocol", -1 },
{ "server-response", 'S', OPT_BOOLEAN, "serverresponse", -1 },
{ "span-hosts", 'H', OPT_BOOLEAN, "spanhosts", -1 },
{ "spider", 0, OPT_BOOLEAN, "spider", -1 },
- { IF_SSL ("sslcadir"), 0, OPT_VALUE, "sslcadir", -1 },
- { IF_SSL ("sslcafile"), 0, OPT_VALUE, "sslcafile", -1 },
- { IF_SSL ("sslcertfile"), 0, OPT_VALUE, "sslcertfile", -1 },
- { IF_SSL ("sslcertkey"), 0, OPT_VALUE, "sslcertkey", -1 },
- { IF_SSL ("sslcerttype"), 0, OPT_VALUE, "sslcerttype", -1 },
- { IF_SSL ("sslcheckcert"), 0, OPT_VALUE, "sslcheckcert", -1 },
- { IF_SSL ("sslprotocol"), 0, OPT_VALUE, "sslprotocol", -1 },
{ "strict-comments", 0, OPT_BOOLEAN, "strictcomments", -1 },
{ "timeout", 'T', OPT_VALUE, "timeout", -1 },
{ "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
{ "tries", 't', OPT_VALUE, "tries", -1 },
- { "use-proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 },
{ "user-agent", 'U', OPT_VALUE, "useragent", -1 },
{ "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
{ "verbose", 0, OPT_BOOLEAN, "verbose", -1 },
*p++ = ':';
break;
case OPT_BOOLEAN:
- /* Don't specify optional arguments for boolean short
- options. They are evil because they prevent combining of
- short options. */
+ /* 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
N_("\
-v, --verbose be verbose (this is the default).\n"),
N_("\
- -nv, --non-verbose turn off verboseness, without being quiet.\n"),
+ -nv, --no-verbose turn off verboseness, without being quiet.\n"),
N_("\
-i, --input-file=FILE download URLs found in FILE.\n"),
N_("\
N_("\
--retry-connrefused retry even if connection is refused.\n"),
N_("\
- -O --output-document=FILE write documents to FILE.\n"),
+ -O, --output-document=FILE write documents to FILE.\n"),
N_("\
-nc, --no-clobber skip downloads that would download to\n\
existing files.\n"),
N_("\
--random-wait wait from 0...2*WAIT secs between retrievals.\n"),
N_("\
- -Y, --proxy=on/off turn proxy on or off.\n"),
+ -Y, --proxy explicitly turn on proxy.\n"),
+ N_("\
+ --no-proxy explicitly turn off proxy.\n"),
N_("\
-Q, --quota=NUMBER set retrieval quota to NUMBER.\n"),
N_("\
N_("\
--limit-rate=RATE limit download rate to RATE.\n"),
N_("\
- --dns-cache=off disable caching DNS lookups.\n"),
+ --no-dns-cache disable caching DNS lookups.\n"),
N_("\
--restrict-file-names=OS restrict chars in file names to ones OS allows.\n"),
+#ifdef ENABLE_IPV6
+ N_("\
+ -4, --inet4-only connect only to IPv4 addresses.\n"),
+ N_("\
+ -6, --inet6-only connect only to IPv6 addresses.\n"),
+ N_("\
+ --prefer-family=FAMILY connect first to addresses of specified family,\n\
+ one of IPv6, IPv4, or none.\n"),
+#endif
"\n",
N_("\
-x, --force-directories force creation of directories.\n"),
N_("\
-nH, --no-host-directories don't create host directories.\n"),
+ N_("\
+ --protocol-directories use protocol name in directories.\n"),
N_("\
-P, --directory-prefix=PREFIX save files to PREFIX/...\n"),
N_("\
N_("\
--http-passwd=PASS set http password to PASS.\n"),
N_("\
- -C, --no-cache disallow server-cached data.\n"),
+ --no-cache disallow server-cached data.\n"),
N_("\
-E, --html-extension save HTML documents with `.html' extension.\n"),
N_("\
N_("\
--referer=URL include `Referer: URL' header in HTTP request.\n"),
N_("\
- -s, --save-headers save the HTTP headers to file.\n"),
+ --save-headers save the HTTP headers to file.\n"),
N_("\
-U, --user-agent=AGENT identify as AGENT instead of Wget/VERSION.\n"),
N_("\
--no-http-keep-alive disable HTTP keep-alive (persistent connections).\n"),
N_("\
- --cookies=off don't use cookies.\n"),
+ --no-cookies don't use cookies.\n"),
N_("\
--load-cookies=FILE load cookies from FILE before session.\n"),
N_("\
#ifdef HAVE_SSL
N_("\
-HTTPS (SSL) options:\n"),
+HTTPS (SSL/TLS) options:\n"),
N_("\
- --sslcertfile=FILE optional client certificate.\n"),
+ --secure-protocol=PR choose SSL protocol, one of auto, SSLv2, SSLv3,\n\
+ and TLSv1.\n"),
N_("\
- --sslcertkey=KEYFILE optional keyfile for this certificate.\n"),
+ --no-check-certificate don't validate the server's certificate.\n"),
N_("\
- --egd-file=FILE file name of the EGD socket.\n"),
+ --certificate=FILE client certificate file.\n"),
N_("\
- --sslcadir=DIR dir where hash list of CA's are stored.\n"),
+ --certificate-type=TYPE client certificate type, PEM or ASN1.\n"),
N_("\
- --sslcafile=FILE file with bundle of CA's\n"),
+ --private-key=FILE private key file.\n"),
N_("\
- --sslcerttype=0/1 Client-Cert type 0=PEM (default) / 1=ASN1 (DER)\n"),
+ --private-key-type=TYPE private key type, PEM or ASN1.\n"),
N_("\
- --sslcheckcert=0/1 Check the server cert agenst given CA\n"),
+ --ca-certificate=FILE file with the bundle of CA's.\n"),
N_("\
- --sslprotocol=0-3 choose SSL protocol; 0=automatic,\n"),
+ --ca-directory=DIR directory where hash list of CA's is stored.\n"),
N_("\
- 1=SSLv2 2=SSLv3 3=TLSv1\n"),
+ --random-file=FILE file with random data for seeding the SSL PRNG.\n"),
+ N_("\
+ --egd-file=FILE file naming the EGD socket with random data.\n"),
"\n",
#endif /* HAVE_SSL */
N_("\
FTP options:\n"),
N_("\
- -nr, --no-remove-listing don't remove `.listing' files.\n"),
+ --no-remove-listing don't remove `.listing' files.\n"),
N_("\
- -g, --glob=on/off turn file name globbing on or off.\n"),
+ --no-glob turn off FTP file name globbing.\n"),
N_("\
- --passive-ftp use the \"passive\" transfer mode.\n"),
+ --no-passive-ftp disable the \"passive\" transfer mode.\n"),
N_("\
- --retr-symlinks when recursing, get linked-to files (not dir).\n"),
+ --retr-symlinks when recursing, get linked-to files (not dir).\n"),
N_("\
--preserve-permissions preserve remote file permissions.\n"),
"\n",
N_("\
-Recursive retrieval:\n"),
+Recursive download:\n"),
N_("\
- -r, --recursive recursive download.\n"),
+ -r, --recursive specify recursive download.\n"),
N_("\
- -l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n"),
+ -l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n"),
N_("\
- --delete-after delete files locally after downloading them.\n"),
+ --delete-after delete files locally after downloading them.\n"),
N_("\
- -k, --convert-links convert non-relative links to relative.\n"),
+ -k, --convert-links make links in downloaded HTML point to local files.\n"),
N_("\
- -K, --backup-converted before converting file X, back up as X.orig.\n"),
+ -K, --backup-converted before converting file X, back up as X.orig.\n"),
N_("\
- -m, --mirror shortcut option equivalent to -r -N -l inf -nr.\n"),
+ -m, --mirror shortcut option equivalent to -r -N -l inf -nr.\n"),
N_("\
- -p, --page-requisites get all images, etc. needed to display HTML page.\n"),
+ -p, --page-requisites get all images, etc. needed to display HTML page.\n"),
N_("\
- --strict-comments turn on strict (SGML) handling of HTML comments.\n"),
+ --strict-comments turn on strict (SGML) handling of HTML comments.\n"),
"\n",
N_("\
N_("\
--follow-tags=LIST comma-separated list of followed HTML tags.\n"),
N_("\
- -G, --ignore-tags=LIST comma-separated list of ignored HTML tags.\n"),
+ --ignore-tags=LIST comma-separated list of ignored HTML tags.\n"),
N_("\
-H, --span-hosts go to foreign hosts when recursive.\n"),
N_("\
for (i = 0; i < countof (help); i++)
fputs (_(help[i]), stdout);
-#ifdef WINDOWS
- ws_help (exec_name);
-#endif
exit (0);
}
{
printf ("GNU Wget %s\n\n", version_string);
fputs (_("\
-Copyright (C) 2003 Free Software Foundation, Inc.\n"), stdout);
+Copyright (C) 2005 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\
++exec_name;
#ifdef WINDOWS
- windows_main_junk (&argc, (char **) argv, (char **) &exec_name);
+ /* Drop extension (typically .EXE) from executable filename. */
+ windows_main (&argc, (char **) argv, (char **) &exec_name);
#endif
/* Set option defaults; read the system wgetrc and ~/.wgetrc. */
{
int val;
struct cmdline_option *opt;
- if (ret == '?')
- {
- print_usage ();
- printf ("\n");
- printf (_("Try `%s --help' for more options.\n"), exec_name);
- exit (2);
- }
/* If LONGINDEX is unchanged, it means RET is referring a short
- option. Look it up in the mapping table. */
+ option. */
if (longindex == -1)
- 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
break;
case OPT_FUNCALL:
{
- void (*func) PARAMS ((void)) = opt->data;
+ void (*func) PARAMS ((void)) = (void (*) PARAMS ((void))) opt->data;
func ();
}
break;
flag ? "0" : "1");
break;
}
+ case OPT__DONT_REMOVE_LISTING:
+ setoptval ("removelisting", "0");
+ break;
}
longindex = -1;
interoption dependency checks. */
if (opt.reclevel == 0)
- opt.reclevel = INFINITE_RECURSION; /* see wget.h for commentary on this */
+ opt.reclevel = INFINITE_RECURSION; /* see recur.h for commentary on this */
if (opt.page_requisites && !opt.recursive)
{
print_usage ();
exit (1);
}
+#ifdef ENABLE_IPV6
+ if (opt.ipv4_only && opt.ipv6_only)
+ {
+ printf (_("Cannot specify both --inet4-only and --inet6-only.\n"));
+ print_usage ();
+ exit (1);
+ }
+#endif
+
nurl = argc - optind;
if (!nurl && !opt.input_filename)
{
}
url[i] = NULL;
- /* Change the title of console window on Windows. #### I think this
- statement should belong to retrieve_url(). --hniksic. */
-#ifdef WINDOWS
- ws_changetitle (*url, nurl);
-#endif
-
/* Initialize logging. */
log_init (opt.lfilename, append_to_log);
/* Open the output filename if necessary. */
if (opt.output_document)
{
+ extern FILE *output_stream;
+ extern int output_stream_regular;
+
if (HYPHENP (opt.output_document))
- opt.dfp = stdout;
+ output_stream = stdout;
else
{
- struct stat st;
- opt.dfp = fopen (opt.output_document, opt.always_rest ? "ab" : "wb");
- if (opt.dfp == NULL)
+ struct_stat 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 (opt.dfp), &st) == 0 && S_ISREG (st.st_mode))
- opt.od_known_regular = 1;
+ if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
+ output_stream_regular = 1;
}
}
{
logprintf (LOG_NOTQUIET,
_("\nFINISHED --%s--\nDownloaded: %s bytes in %d files\n"),
- time_str (NULL), legible_large_int (total_downloaded_bytes),
+ time_str (NULL), with_thousand_seps_large (total_downloaded_bytes),
opt.numurls);
/* Print quota warning, if exceeded. */
if (opt.quota && total_downloaded_bytes > opt.quota)
logprintf (LOG_NOTQUIET,
_("Download quota (%s bytes) EXCEEDED!\n"),
- legible (opt.quota));
+ with_thousand_seps_large (opt.quota));
}
- if (opt.cookies_output && wget_cookie_jar)
- cookie_jar_save (wget_cookie_jar, opt.cookies_output);
+ if (opt.cookies_output)
+ save_cookies ();
if (opt.convert_links && !opt.delete_after)
convert_all_links ();
static RETSIGTYPE
redirect_output_signal (int sig)
{
- char *signal_name = (sig == SIGHUP ? "SIGHUP" :
- (sig == SIGUSR1 ? "SIGUSR1" :
- "WTF?!"));
+ const char *signal_name = (sig == SIGHUP ? "SIGHUP" :
+ (sig == SIGUSR1 ? "SIGUSR1" :
+ "WTF?!"));
log_request_redirect_output (signal_name);
progress_schedule_redirect ();
signal (sig, redirect_output_signal);
projects / wget / blobdiff