#include <getpass.h>
#include <quote.h>
+#ifdef WINDOWS
+# include <io.h>
+# include <fcntl.h>
+#endif
+
#ifdef __VMS
-#include "vms.h"
+# include "vms.h"
#endif /* __VMS */
#ifndef PATH_SEPARATOR
{ "continue", 'c', OPT_BOOLEAN, "continue", -1 },
{ "convert-links", 'k', OPT_BOOLEAN, "convertlinks", -1 },
{ "content-disposition", 0, OPT_BOOLEAN, "contentdisposition", -1 },
+ { "content-on-error", 0, OPT_BOOLEAN, "contentonerror", -1 },
{ "cookies", 0, OPT_BOOLEAN, "cookies", -1 },
{ "cut-dirs", 0, OPT_VALUE, "cutdirs", -1 },
{ WHEN_DEBUG ("debug"), 'd', OPT_BOOLEAN, "debug", -1 },
}
/* Print the usage message. */
-static void
+static int
print_usage (int error)
{
- fprintf (error ? stderr : stdout, _("Usage: %s [OPTION]... [URL]...\n"),
- exec_name);
+ return fprintf (error ? stderr : stdout,
+ _("Usage: %s [OPTION]... [URL]...\n"), exec_name);
}
/* Print the help message, describing all the available options. If
N_("\
--content-disposition honor the Content-Disposition header when\n\
choosing local file names (EXPERIMENTAL).\n"),
+ N_("\
+ --content-on-error output the received content on server errors.\n"),
N_("\
--auth-no-challenge send Basic HTTP authentication information\n\
without first waiting for the server's\n\
size_t i;
- printf (_("GNU Wget %s, a non-interactive network retriever.\n"),
- version_string);
- print_usage (0);
+ if (printf (_("GNU Wget %s, a non-interactive network retriever.\n"),
+ version_string) < 0)
+ exit (3);
+ if (print_usage (0) < 0)
+ exit (3);
for (i = 0; i < countof (help); i++)
- fputs (_(help[i]), stdout);
+ if (fputs (_(help[i]), stdout) < 0)
+ exit (3);
exit (0);
}
to at most line_length. prefix is printed on the first line
and an appropriate number of spaces are added on subsequent
lines.*/
-static void
+static int
format_and_print_line (const char *prefix, const char *line,
int line_length)
{
if (line_length <= 0)
line_length = MAX_CHARS_PER_LINE - TABULATION;
- printf ("%s", prefix);
+ if (printf ("%s", prefix) < 0)
+ return -1;
remaining_chars = line_length;
/* We break on spaces. */
token = strtok (line_dup, " ");
token on the next line. */
if (remaining_chars <= strlen (token))
{
- printf ("\n%*c", TABULATION, ' ');
+ if (printf ("\n%*c", TABULATION, ' ') < 0)
+ return -1;
remaining_chars = line_length - TABULATION;
}
- printf ("%s ", token);
+ if (printf ("%s ", token) < 0)
+ return -1;
remaining_chars -= strlen (token) + 1; /* account for " " */
token = strtok (NULL, " ");
}
- printf ("\n");
+ if (printf ("\n") < 0)
+ return -1;
xfree (line_dup);
+ return 0;
}
static void
char *env_wgetrc, *user_wgetrc;
int i;
- printf (_("GNU Wget %s built on %s.\n\n"), version_string, OS_TYPE);
+ if (printf (_("GNU Wget %s built on %s.\n\n"), version_string, OS_TYPE) < 0)
+ exit (3);
for (i = 0; compiled_features[i] != NULL; )
{
int line_length = MAX_CHARS_PER_LINE;
while ((line_length > 0) && (compiled_features[i] != NULL))
{
- printf ("%s ", compiled_features[i]);
+ if (printf ("%s ", compiled_features[i]) < 0)
+ exit (3);
line_length -= strlen (compiled_features[i]) + 2;
i++;
}
- printf ("\n");
+ if (printf ("\n") < 0)
+ exit (3);
}
- printf ("\n");
+ if (printf ("\n") < 0)
+ exit (3);
/* Handle the case when $WGETRC is unset and $HOME/.wgetrc is
absent. */
- printf ("%s\n", wgetrc_title);
+ if (printf ("%s\n", wgetrc_title) < 0)
+ exit (3);
+
env_wgetrc = wgetrc_env_file_name ();
if (env_wgetrc && *env_wgetrc)
{
- printf (_(" %s (env)\n"), env_wgetrc);
+ if (printf (_(" %s (env)\n"), env_wgetrc) < 0)
+ exit (3);
xfree (env_wgetrc);
}
user_wgetrc = wgetrc_user_file_name ();
if (user_wgetrc)
{
- printf (_(" %s (user)\n"), user_wgetrc);
+ if (printf (_(" %s (user)\n"), user_wgetrc) < 0)
+ exit (3);
xfree (user_wgetrc);
}
#ifdef SYSTEM_WGETRC
- printf (_(" %s (system)\n"), SYSTEM_WGETRC);
+ if (printf (_(" %s (system)\n"), SYSTEM_WGETRC) < 0)
+ exit (3);
#endif
#ifdef ENABLE_NLS
- format_and_print_line (locale_title,
+ if (format_and_print_line (locale_title,
LOCALEDIR,
- MAX_CHARS_PER_LINE);
+ MAX_CHARS_PER_LINE) < 0)
+ exit (3);
#endif /* def ENABLE_NLS */
if (compilation_string != NULL)
- format_and_print_line (compile_title,
- compilation_string,
- MAX_CHARS_PER_LINE);
+ if (format_and_print_line (compile_title,
+ compilation_string,
+ MAX_CHARS_PER_LINE) < 0)
+ exit (3);
if (link_string != NULL)
- format_and_print_line (link_title,
- link_string,
- MAX_CHARS_PER_LINE);
+ if (format_and_print_line (link_title,
+ link_string,
+ MAX_CHARS_PER_LINE) < 0)
+ exit (3);
+
+ if (printf ("\n") < 0)
+ exit (3);
- printf ("\n");
/* TRANSLATORS: When available, an actual copyright character
- (cirle-c) should be used in preference to "(C)". */
- fputs (_("\
-Copyright (C) 2009 Free Software Foundation, Inc.\n"), stdout);
- fputs (_("\
+ (circle-c) should be used in preference to "(C)". */
+ if (fputs (_("\
+Copyright (C) 2011 Free Software Foundation, Inc.\n"), stdout) < 0)
+ exit (3);
+ if (fputs (_("\
License GPLv3+: GNU GPL version 3 or later\n\
<http://www.gnu.org/licenses/gpl.html>.\n\
This is free software: you are free to change and redistribute it.\n\
-There is NO WARRANTY, to the extent permitted by law.\n"), stdout);
+There is NO WARRANTY, to the extent permitted by law.\n"), stdout) < 0)
+ exit (3);
/* TRANSLATORS: When available, please use the proper diacritics for
names such as this one. See en_US.po for reference. */
- fputs (_("\nOriginally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"),
- stdout);
- fputs (_("Please send bug reports and questions to <bug-wget@gnu.org>.\n"),
- stdout);
+ if (fputs (_("\nOriginally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"),
+ stdout) < 0)
+ exit (3);
+ if (fputs (_("Please send bug reports and questions to <bug-wget@gnu.org>.\n"),
+ stdout) < 0)
+ exit (3);
+
exit (0);
}
if (HYPHENP (opt.output_document))
{
#ifdef WINDOWS
- FILE *result;
- result = freopen ("CONOUT$", "wb", stdout);
- if (result == NULL)
- {
- logputs (LOG_NOTQUIET, _("\
-WARNING: Can't reopen standard output in binary mode;\n\
- downloaded file may contain inappropriate line endings.\n"));
- }
+ _setmode (_fileno (stdout), _O_BINARY);
#endif
output_stream = stdout;
}