/* Command line parsing.
- Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
This file is part of GNU Wget.
{ "timeout", 'T', OPT_VALUE, "timeout", -1 },
{ "timestamping", 'N', OPT_BOOLEAN, "timestamping", -1 },
{ "tries", 't', OPT_VALUE, "tries", -1 },
+ { "unlink", 0, OPT_BOOLEAN, "unlink", -1 },
+ { "trust-server-names", 0, OPT_BOOLEAN, "trustservernames", -1 },
+ { "use-server-timestamps", 0, OPT_BOOLEAN, "useservertimestamps", -1 },
{ "user", 0, OPT_VALUE, "user", -1 },
{ "user-agent", 'U', OPT_VALUE, "useragent", -1 },
{ "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
/* Print the usage message. */
static void
-print_usage (void)
+print_usage (int error)
{
- printf (_("Usage: %s [OPTION]... [URL]...\n"), exec_name);
+ fprintf (error ? stderr : stdout, _("Usage: %s [OPTION]... [URL]...\n"),
+ exec_name);
}
/* Print the help message, describing all the available options. If
-N, --timestamping don't re-retrieve files unless newer than\n\
local.\n"),
N_("\
+ --no-use-server-timestamps don't set the local file's timestamp by\n\
+ the one on the server.\n"),
+ N_("\
-S, --server-response print server response.\n"),
N_("\
--spider don't download anything.\n"),
N_("\
--waitretry=SECONDS wait 1..SECONDS between retries of a retrieval.\n"),
N_("\
- --random-wait wait from 0...2*WAIT secs between retrievals.\n"),
+ --random-wait wait from 0.5*WAIT...1.5*WAIT secs between retrievals.\n"),
N_("\
--no-proxy explicitly turn off proxy.\n"),
N_("\
--local-encoding=ENC use ENC as the local encoding for IRIs.\n"),
N_("\
--remote-encoding=ENC use ENC as the default remote encoding.\n"),
+ N_("\
+ --unlink remove file before clobber.\n"),
"\n",
N_("\
N_("\
-I, --include-directories=LIST list of allowed directories.\n"),
N_("\
+ --trust-server-names use the name specified by the redirection\n\
+ url last component.\n"),
+ N_("\
-X, --exclude-directories=LIST list of excluded directories.\n"),
N_("\
-np, --no-parent don't ascend to the parent directory.\n"),
printf (_("GNU Wget %s, a non-interactive network retriever.\n"),
version_string);
- print_usage ();
+ print_usage (0);
for (i = 0; i < countof (help); i++)
fputs (_(help[i]), stdout);
const char *locale_title = _("Locale: ");
const char *compile_title = _("Compile: ");
const char *link_title = _("Link: ");
- char *line;
char *env_wgetrc, *user_wgetrc;
int i;
names such as this one. See en_US.po for reference. */
fputs (_("\nOriginally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"),
stdout);
- fputs (_("Currently maintained by Micah Cowan <micah@cowan.name>.\n"),
- stdout);
fputs (_("Please send bug reports and questions to <bug-wget@gnu.org>.\n"),
stdout);
exit (0);
{
char **url, **t;
int i, ret, longindex;
- int nurl, status;
+ int nurl;
bool append_to_log = false;
program_name = argv[0];
{
if (ret == '?')
{
- print_usage ();
+ print_usage (0);
printf ("\n");
printf (_("Try `%s --help' for more options.\n"), exec_name);
exit (2);
setoptval ("noparent", "1", opt->long_name);
break;
default:
- printf (_("%s: illegal option -- `-n%c'\n"), exec_name, *p);
- print_usage ();
- printf ("\n");
- printf (_("Try `%s --help' for more options.\n"), exec_name);
+ fprintf (stderr, _("%s: illegal option -- `-n%c'\n"),
+ exec_name, *p);
+ print_usage (1);
+ fprintf (stderr, "\n");
+ fprintf (stderr, _("Try `%s --help' for more options.\n"),
+ exec_name);
exit (1);
}
break;
/* Sanity checks. */
if (opt.verbose && opt.quiet)
{
- printf (_("Can't be verbose and quiet at the same time.\n"));
- print_usage ();
+ fprintf (stderr, _("Can't be verbose and quiet at the same time.\n"));
+ print_usage (1);
exit (1);
}
if (opt.timestamping && opt.noclobber)
{
- printf (_("\
+ fprintf (stderr, _("\
Can't timestamp and not clobber old files at the same time.\n"));
- print_usage ();
+ print_usage (1);
exit (1);
}
#ifdef ENABLE_IPV6
if (opt.ipv4_only && opt.ipv6_only)
{
- printf (_("Cannot specify both --inet4-only and --inet6-only.\n"));
- print_usage ();
+ fprintf (stderr,
+ _("Cannot specify both --inet4-only and --inet6-only.\n"));
+ print_usage (1);
exit (1);
}
#endif
{
fputs (_("\
Cannot specify both -k and -O if multiple URLs are given, or in combination\n\
-with -p or -r. See the manual for details.\n\n"), stdout);
- print_usage ();
+with -p or -r. See the manual for details.\n\n"), stderr);
+ print_usage (1);
exit (1);
}
if (opt.page_requisites
if (opt.noclobber && file_exists_p(opt.output_document))
{
/* Check if output file exists; if it does, exit. */
- logprintf (LOG_VERBOSE, _("File `%s' already there; not retrieving.\n"), opt.output_document);
+ logprintf (LOG_VERBOSE,
+ _("File `%s' already there; not retrieving.\n"),
+ opt.output_document);
exit(1);
}
}
if (opt.ask_passwd && opt.passwd)
{
- printf (_("Cannot specify both --ask-password and --password.\n"));
- print_usage ();
+ fprintf (stderr,
+ _("Cannot specify both --ask-password and --password.\n"));
+ print_usage (1);
exit (1);
}
if (!nurl && !opt.input_filename)
{
/* No URL specified. */
- printf (_("%s: missing URL\n"), exec_name);
- print_usage ();
+ fprintf (stderr, _("%s: missing URL\n"), exec_name);
+ print_usage (1);
printf ("\n");
/* #### Something nicer should be printed here -- similar to the
pre-1.5 `--help' page. */
- printf (_("Try `%s --help' for more options.\n"), exec_name);
+ fprintf (stderr, _("Try `%s --help' for more options.\n"), exec_name);
exit (1);
}
if (opt.enable_iri || opt.locale || opt.encoding_remote)
{
/* sXXXav : be more specific... */
- printf(_("This version does not have support for IRIs\n"));
+ fprintf (stderr, _("This version does not have support for IRIs\n"));
exit(1);
}
#endif
if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
output_stream_regular = true;
}
+ if (!output_stream_regular && opt.convert_links)
+ {
+ fprintf (stderr, _("-k can be used together with -O only if \
+outputting to a regular file.\n"));
+ print_usage (1);
+ exit(1);
+ }
}
#ifdef __VMS
any), otherwise according to the current default device.
*/
if (output_stream == NULL)
- {
- set_ods5_dest( "SYS$DISK");
- }
+ set_ods5_dest( "SYS$DISK");
else if (output_stream != stdout)
- {
- set_ods5_dest( opt.output_document);
- }
+ set_ods5_dest( opt.output_document);
#endif /* def __VMS */
#ifdef WINDOWS
signal (SIGWINCH, progress_handle_sigwinch);
#endif
- status = RETROK; /* initialize it, just-in-case */
/* Retrieve the URLs from argument list. */
for (t = url; *t; t++)
{
char *error = url_error (*t, url_err);
logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, error);
xfree (error);
- status = URLERROR;
}
else
{
if (url_scheme (*t) == SCHEME_FTP)
opt.follow_ftp = 1;
- status = retrieve_tree (url_parsed, NULL);
+ retrieve_tree (url_parsed, NULL);
opt.follow_ftp = old_follow_ftp;
}
else
{
- status = retrieve_url (url_parsed, *t, &filename, &redirected_URL,
- NULL, &dt, opt.recursive, iri, true);
+ retrieve_url (url_parsed, *t, &filename, &redirected_URL, NULL,
+ &dt, opt.recursive, iri, true);
}
if (opt.delete_after && file_exists_p(filename))
if (opt.input_filename)
{
int count;
- status = retrieve_from_file (opt.input_filename, opt.force_html, &count);
+ retrieve_from_file (opt.input_filename, opt.force_html, &count);
if (!count)
logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"),
opt.input_filename);
/* Print broken links. */
if (opt.recursive && opt.spider)
- {
- print_broken_links();
- }
+ print_broken_links ();
/* Print the downloaded sum. */
if ((opt.recursive || opt.page_requisites
projects / wget / blobdiff