#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif /* HAVE_UNISTD_H */
-#include <sys/types.h>
-#ifdef HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-#endif /* HAVE_STRING_H */
-#ifdef HAVE_SIGNAL_H
-# include <signal.h>
-#endif
-#ifdef HAVE_NLS
-#ifdef HAVE_LOCALE_H
+#include <string.h>
+#include <signal.h>
+#if defined(HAVE_NLS) && defined(HAVE_LOCALE_H)
# include <locale.h>
-#endif /* HAVE_LOCALE_H */
-#endif /* HAVE_NLS */
+#endif
#include <assert.h>
-
#include <errno.h>
-#ifndef errno
-extern int errno;
-#endif
#include "wget.h"
#include "utils.h"
#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"
struct options opt;
-extern LARGE_INT total_downloaded_bytes;
+extern SUM_SIZE_INT total_downloaded_bytes;
extern char *version_string;
extern struct cookie_jar *wget_cookie_jar;
-static RETSIGTYPE redirect_output_signal PARAMS ((int));
+static void redirect_output_signal (int);
const char *exec_name;
\f
-/* Initialize I18N. The initialization amounts to invoking
- setlocale(), bindtextdomain() and textdomain().
- Does nothing if NLS is disabled or missing. */
+/* 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. */
+
static void
i18n_initialize (void)
{
- /* If HAVE_NLS is defined, assume the existence of the three
- functions invoked here. */
+ /* HAVE_NLS implies existence of functions invoked here. */
#ifdef HAVE_NLS
/* Set the current locale. */
- /* Here we use LC_MESSAGES instead of LC_ALL, for two reasons.
- First, message catalogs are all of I18N Wget uses anyway.
- Second, setting LC_ALL has a dangerous potential of messing
- things up. For example, when in a foreign locale, Solaris
- strptime() fails to handle international dates correctly, which
- makes http_atotm() malfunction. */
-#ifdef LC_MESSAGES
+ /* Where possible, sets only LC_MESSAGES and LC_CTYPE. Other
+ categories, such as numeric, time, or collation, break code that
+ parses data received from the network and relies on C-locale
+ behavior of libc functions. For example, Solaris strptime fails
+ to recognize English month names in non-English locales, which
+ breaks http_atotm. Some implementations of fnmatch perform
+ unwanted case folding in non-C locales. ctype macros, while they
+ were used, provided another example against LC_ALL. */
+#if defined(LC_MESSAGES) && defined(LC_CTYPE)
setlocale (LC_MESSAGES, "");
- setlocale (LC_CTYPE, "");
+ setlocale (LC_CTYPE, ""); /* safe because we use safe-ctype */
#else
setlocale (LC_ALL, "");
#endif
\f
/* Definition of command-line options. */
-static void print_help PARAMS ((void));
-static void print_version PARAMS ((void));
+static void print_help (void);
+static void print_version (void);
#ifdef HAVE_SSL
# define IF_SSL(x) x
#endif
#ifdef ENABLE_DEBUG
-# define IF_DEBUG(x) x
+# define WHEN_DEBUG(x) x
#else
-# define IF_DEBUG(x) NULL
+# define WHEN_DEBUG(x) NULL
#endif
struct cmdline_option {
OPT__DONT_REMOVE_LISTING,
OPT__EXECUTE,
OPT__NO,
- OPT__PARENT,
+ OPT__PARENT
} type;
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 },
+ { 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 },
{ "convert-links", 'k', OPT_BOOLEAN, "convertlinks", -1 },
{ "cookies", 0, OPT_BOOLEAN, "cookies", -1 },
{ "cut-dirs", 0, OPT_VALUE, "cutdirs", -1 },
- { IF_DEBUG ("debug"), 'd', OPT_BOOLEAN, "debug", -1 },
+ { WHEN_DEBUG ("debug"), 'd', OPT_BOOLEAN, "debug", -1 },
{ "delete-after", 0, OPT_BOOLEAN, "deleteafter", -1 },
{ "directories", 0, OPT_BOOLEAN, "dirstruct", -1 },
{ "directory-prefix", 'P', OPT_VALUE, "dirprefix", -1 },
{ "follow-tags", 0, OPT_VALUE, "followtags", -1 },
{ "force-directories", 'x', OPT_BOOLEAN, "dirstruct", -1 },
{ "force-html", 'F', OPT_BOOLEAN, "forcehtml", -1 },
- { "ftp-passwd", 0, OPT_VALUE, "ftppasswd", -1 },
+ { "ftp-password", 0, OPT_VALUE, "ftppassword", -1 },
+ { "ftp-user", 0, OPT_VALUE, "ftpuser", -1 },
{ "glob", 0, OPT_BOOLEAN, "glob", -1 },
{ "header", 0, OPT_VALUE, "header", -1 },
{ "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },
{ "html-extension", 'E', OPT_BOOLEAN, "htmlextension", -1 },
{ "htmlify", 0, OPT_BOOLEAN, "htmlify", -1 },
{ "http-keep-alive", 0, OPT_BOOLEAN, "httpkeepalive", -1 },
- { "http-passwd", 0, OPT_VALUE, "httppasswd", -1 },
+ { "http-passwd", 0, OPT_VALUE, "httppassword", -1 }, /* deprecated */
+ { "http-password", 0, OPT_VALUE, "httppassword", -1 },
{ "http-user", 0, OPT_VALUE, "httpuser", -1 },
{ "ignore-length", 0, OPT_BOOLEAN, "ignorelength", -1 },
{ "ignore-tags", 0, OPT_VALUE, "ignoretags", -1 },
{ "page-requisites", 'p', OPT_BOOLEAN, "pagerequisites", -1 },
{ "parent", 0, OPT__PARENT, NULL, optional_argument },
{ "passive-ftp", 0, OPT_BOOLEAN, "passiveftp", -1 },
+ { "password", 0, OPT_VALUE, "password", -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 },
{ "protocol-directories", 0, OPT_BOOLEAN, "protocoldirectories", -1 },
- { "proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 },
- { "proxy-passwd", 0, OPT_VALUE, "proxypasswd", -1 },
+ { "proxy", 0, OPT_BOOLEAN, "useproxy", -1 },
+ { "proxy__compat", 'Y', OPT_VALUE, "useproxy", -1 }, /* back-compatible */
+ { "proxy-passwd", 0, OPT_VALUE, "proxypassword", -1 }, /* deprecated */
+ { "proxy-password", 0, OPT_VALUE, "proxypassword", -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", 0, OPT_VALUE, "user", -1 },
{ "user-agent", 'U', OPT_VALUE, "useragent", -1 },
{ "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
{ "verbose", 0, OPT_BOOLEAN, "verbose", -1 },
{ "waitretry", 0, OPT_VALUE, "waitretry", -1 },
};
-#undef IF_DEBUG
+#undef WHEN_DEBUG
#undef IF_SSL
/* Return a string that contains S with "no-" prepended. The string
*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
-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_("\
+ --user=USER set both ftp and http user to USER.\n"),
+ N_("\
+ --password=PASS set both ftp and http password to PASS.\n"),
"\n",
N_("\
N_("\
--http-user=USER set http user to USER.\n"),
N_("\
- --http-passwd=PASS set http password to PASS.\n"),
+ --http-password=PASS set http password to PASS.\n"),
N_("\
--no-cache disallow server-cached data.\n"),
N_("\
N_("\
--proxy-user=USER set USER as proxy username.\n"),
N_("\
- --proxy-passwd=PASS set PASS as proxy password.\n"),
+ --proxy-password=PASS set PASS as proxy password.\n"),
N_("\
--referer=URL include `Referer: URL' header in HTTP request.\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 secure protocol, one of auto, SSLv2,\n\
+ SSLv3, 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 DER.\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 DER.\n"),
N_("\
- --sslcheckcert=0/1 Check the server cert against given CA.\n"),
+ --ca-certificate=FILE file with the bundle of CA's.\n"),
N_("\
- --sslprotocol=0-3 choose SSL protocol; 0=automatic,\n\
- 1=SSLv2 2=SSLv3 3=TLSv1.\n"),
+ --ca-directory=DIR directory where hash list of CA's is stored.\n"),
+ 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_("\
+ --ftp-user=USER set ftp user to USER.\n"),
+ N_("\
+ --ftp-password=PASS set ftp password to PASS.\n"),
N_("\
--no-remove-listing don't remove `.listing' files.\n"),
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"),
N_("\
char **url, **t;
int i, ret, longindex;
int nurl, status;
- int append_to_log = 0;
+ bool append_to_log = false;
i18n_initialize ();
switch (opt->type)
{
case OPT_VALUE:
- setoptval (opt->data, optarg);
+ 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);
+ setoptval (opt->data, optarg, opt->long_name);
else
{
/* NEG is true for `--no-FOO' style boolean options. */
- int neg = val & BOOLEAN_NEG_MARKER;
- setoptval (opt->data, neg ? "0" : "1");
+ bool neg = !!(val & BOOLEAN_NEG_MARKER);
+ setoptval (opt->data, neg ? "0" : "1", opt->long_name);
}
break;
case OPT_FUNCALL:
{
- void (*func) PARAMS ((void)) = (void (*) PARAMS ((void))) opt->data;
+ void (*func) (void) = (void (*) (void)) opt->data;
func ();
}
break;
case OPT__APPEND_OUTPUT:
- setoptval ("logfile", optarg);
- append_to_log = 1;
+ setoptval ("logfile", optarg, opt->long_name);
+ append_to_log = true;
break;
case OPT__EXECUTE:
run_command (optarg);
switch (*p)
{
case 'v':
- setoptval ("verbose", "0");
+ setoptval ("verbose", "0", opt->long_name);
break;
case 'H':
- setoptval ("addhostdir", "0");
+ setoptval ("addhostdir", "0", opt->long_name);
break;
case 'd':
- setoptval ("dirstruct", "0");
+ setoptval ("dirstruct", "0", opt->long_name);
break;
case 'c':
- setoptval ("noclobber", "1");
+ setoptval ("noclobber", "1", opt->long_name);
break;
case 'p':
- setoptval ("noparent", "1");
+ setoptval ("noparent", "1", opt->long_name);
break;
default:
printf (_("%s: illegal option -- `-n%c'\n"), exec_name, *p);
/* The wgetrc commands are named noparent and noclobber,
so we must revert the meaning of the cmdline options
before passing the value to setoptval. */
- int flag = 1;
+ 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");
+ flag ? "0" : "1", opt->long_name);
break;
}
case OPT__DONT_REMOVE_LISTING:
- setoptval ("removelisting", "0");
+ setoptval ("removelisting", "0", opt->long_name);
break;
}
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)
{
if (opt.output_document)
{
extern FILE *output_stream;
- extern int output_stream_regular;
+ extern bool output_stream_regular;
if (HYPHENP (opt.output_document))
output_stream = stdout;
else
{
- struct_stat st;
+ struct_fstat st;
output_stream = fopen (opt.output_document,
opt.always_rest ? "ab" : "wb");
if (output_stream == NULL)
exit (1);
}
if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
- output_stream_regular = 1;
+ output_stream_regular = true;
}
}
ws_startup ();
#endif
+#ifdef SIGHUP
/* Setup the signal handler to redirect output when hangup is
received. */
-#ifdef HAVE_SIGNAL
if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
signal(SIGHUP, redirect_output_signal);
+#endif
/* ...and do the same for SIGUSR1. */
+#ifdef SIGUSR1
signal (SIGUSR1, redirect_output_signal);
+#endif
+#ifdef SIGPIPE
/* Writing to a closed socket normally signals SIGPIPE, and the
process exits. What we want is to ignore SIGPIPE and just check
for the return value of write(). */
signal (SIGPIPE, SIG_IGN);
+#endif
#ifdef SIGWINCH
signal (SIGWINCH, progress_handle_sigwinch);
#endif
-#endif /* HAVE_SIGNAL */
status = RETROK; /* initialize it, just-in-case */
/* Retrieve the URLs from argument list. */
|| (opt.input_filename && total_downloaded_bytes != 0))
{
logprintf (LOG_NOTQUIET,
- _("\nFINISHED --%s--\nDownloaded: %s bytes in %d files\n"),
- time_str (NULL), legible_large_int (total_downloaded_bytes),
+ _("\nFINISHED --%s--\nDownloaded: %s in %d files\n"),
+ time_str (NULL),
+ human_readable (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));
+ _("Download quota of %s EXCEEDED!\n"),
+ human_readable (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 ();
return 1;
}
\f
-#ifdef HAVE_SIGNAL
+#if defined(SIGHUP) || defined(SIGUSR1)
/* 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.
-
- #### It is unsafe to do call libc functions from a signal handler.
- What we should do is, set a global variable, and have the code in
- log.c pick it up. */
+ If that is impossible, the output will be turned off. */
-static RETSIGTYPE
+static void
redirect_output_signal (int sig)
{
const char *signal_name = (sig == SIGHUP ? "SIGHUP" :
progress_schedule_redirect ();
signal (sig, redirect_output_signal);
}
-#endif /* HAVE_SIGNAL */
+#endif
projects / wget / blobdiff