/* Command line parsing.
- Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001
+ Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
Free Software Foundation, Inc.
This file is part of GNU Wget.
You should have received a copy of the GNU General Public License
along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+In addition, as a special exception, the Free Software Foundation
+gives permission to link the code of its release of Wget with the
+OpenSSL project's "OpenSSL" library (or with modified versions of it
+that use the same license as the "OpenSSL" library), and distribute
+the linked executables. You must obey the GNU General Public License
+in all respects for all of the code used other than "OpenSSL". If you
+modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so. If you do not wish to do
+so, delete this exception statement from your version. */
#include <config.h>
#endif /* HAVE_NLS */
#include <errno.h>
-#define OPTIONS_DEFINED_HERE /* for options.h */
-
#include "wget.h"
#include "utils.h"
#include "init.h"
struct options opt;
+extern struct cookie_jar *wget_cookie_jar;
+
/* From log.c. */
void log_init PARAMS ((const char *, int));
void log_close PARAMS ((void));
-void redirect_output PARAMS ((const char *));
+void log_request_redirect_output PARAMS ((const char *));
static RETSIGTYPE redirect_output_signal PARAMS ((int));
-i, --input-file=FILE download URLs found in FILE.\n\
-F, --force-html treat input file as HTML.\n\
-B, --base=URL prepends URL to relative links in -F -i file.\n\
- --sslcertfile=FILE optional client certificate.\n\
- --sslcertkey=KEYFILE optional keyfile for this certificate.\n\
- --egd-file=FILE file name of the EGD socket.\n\
-\n"), stdout);
+\n"),stdout);
fputs (_("\
Download:\n\
- --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local host.\n\
-t, --tries=NUMBER set number of retries to NUMBER (0 unlimits).\n\
+ --retry-connrefused retry even if connection is refused.\n\
-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\
--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\
+ --bind-address=ADDRESS bind to ADDRESS (hostname or IP) on local host.\n\
--limit-rate=RATE limit download rate to RATE.\n\
\n"), stdout);
fputs (_("\
--cookies=off don't use cookies.\n\
--load-cookies=FILE load cookies from FILE before session.\n\
--save-cookies=FILE save cookies to FILE after session.\n\
+ --post-data=STRING use the POST method; send STRING as the data.\n\
+ --post-file=FILE use the POST method; send contents of FILE.\n\
+\n"), stdout);
+#ifdef HAVE_SSL
+ fputs (_("\
+HTTPS (SSL) options:\n\
+ --sslcertfile=FILE optional client certificate.\n\
+ --sslcertkey=KEYFILE optional keyfile for this certificate.\n\
+ --egd-file=FILE file name of the EGD socket.\n\
+ --sslcadir=DIR dir where hash list of CA's are stured.\n\
+ --sslcafile=FILE file with bundle of CA's\n\
+ --sslcerttype=0/1 Client-Cert type 0=PEM (default) / 1=ASN1 (DER)\n\
+ --sslcheckcert=0/1 Check the server cert agenst given CA\n\
+ --sslprotocol=0-3 choose SSL protocol; 0=automatic,\n\
+ 1=SSLv2 2=SSLv3 3=TLSv1\n\
\n"), stdout);
+#endif
fputs (_("\
FTP options:\n\
-nr, --dont-remove-listing don\'t remove `.listing\' files.\n\
\n"), stdout);
fputs (_("\
Recursive retrieval:\n\
- -r, --recursive recursive web-suck -- use with care!\n\
+ -r, --recursive recursive download.\n\
-l, --level=NUMBER maximum recursion depth (inf or 0 for infinite).\n\
--delete-after delete files locally after downloading them.\n\
-k, --convert-links convert non-relative links to relative.\n\
{ "recursive", no_argument, NULL, 'r' },
{ "relative", no_argument, NULL, 'L' },
{ "retr-symlinks", no_argument, NULL, 137 },
+ { "retry-connrefused", no_argument, NULL, 174 },
{ "save-headers", no_argument, NULL, 's' },
{ "server-response", no_argument, NULL, 'S' },
{ "span-hosts", no_argument, NULL, 'H' },
{ "no", required_argument, NULL, 'n' },
{ "output-document", required_argument, NULL, 'O' },
{ "output-file", required_argument, NULL, 'o' },
+ { "post-data", required_argument, NULL, 167 },
+ { "post-file", required_argument, NULL, 168 },
{ "progress", required_argument, NULL, 163 },
{ "proxy", required_argument, NULL, 'Y' },
{ "proxy-passwd", required_argument, NULL, 144 },
{ "sslcertfile", required_argument, NULL, 158 },
{ "sslcertkey", required_argument, NULL, 159 },
{ "egd-file", required_argument, NULL, 166 },
+ { "sslcadir", required_argument, NULL, 169},
+ { "sslcafile", required_argument, NULL, 170},
+ { "sslcerttype", required_argument, NULL, 171},
+ { "sslcheckcert", required_argument, NULL, 172},
+ { "sslprotocol", required_argument, NULL, 173},
#endif /* HAVE_SSL */
{ "wait", required_argument, NULL, 'w' },
{ "waitretry", required_argument, NULL, 152 },
case 'x':
setval ("dirstruct", "on");
break;
+ case 174:
+ setval ("retryconnrefused", "on");
+ break;
/* Options accepting an argument: */
case 129:
case 166:
setval ("egdfile", optarg);
break;
+ case 169:
+ setval ("sslcadir", optarg);
+ break;
+ case 170:
+ setval ("sslcafile", optarg);
+ break;
+ case 171:
+ setval ("sslcerttype", optarg);
+ break;
+ case 172:
+ setval ("sslcheckcert", optarg);
+ break;
+ case 173:
+ setval ("sslprotocol", optarg);
+ break;
#endif /* HAVE_SSL */
+ case 167:
+ setval ("postdata", optarg);
+ break;
+ case 168:
+ setval ("postfile", optarg);
+ break;
case 'A':
setval ("accept", optarg);
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.background)
fork_to_background ();
+ /* 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);
+
/* Allocate basic pointer. */
url = ALLOCA_ARRAY (char *, nurl + 1);
/* Fill in the arguments. */
legible (opt.quota));
}
- if (opt.cookies_output)
- save_cookies (opt.cookies_output);
+ if (opt.cookies_output && wget_cookie_jar)
+ cookie_jar_save (wget_cookie_jar, opt.cookies_output);
if (opt.convert_links && !opt.delete_after)
{
static RETSIGTYPE
redirect_output_signal (int sig)
{
- char tmp[100];
- signal (sig, redirect_output_signal);
- /* Please note that the double `%' in `%%s' is intentional, because
- redirect_output passes tmp through printf. */
- sprintf (tmp, _("%s received, redirecting output to `%%s'.\n"),
- (sig == SIGHUP ? "SIGHUP" :
- (sig == SIGUSR1 ? "SIGUSR1" :
- "WTF?!")));
- redirect_output (tmp);
+ char *signal_name = (sig == SIGHUP ? "SIGHUP" :
+ (sig == SIGUSR1 ? "SIGUSR1" :
+ "WTF?!"));
+ log_request_redirect_output (signal_name);
progress_schedule_redirect ();
+ signal (sig, redirect_output_signal);
}
#endif /* HAVE_SIGNAL */