Rename --html-extension to --adjust-extension.

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index 922d605b2f5c28918b3fa5871ece6620f32f37d3..5c0b3315013189970e178752c35ffc4c4933dfbc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -1,12 +1,12 @@
 /* Command line parsing.
 /* Command line parsing.

-   Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or

 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -15,60 +15,53 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 GNU General Public License for more details.
 
 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.
+along with Wget.  If not, see <http://www.gnu.org/licenses/>.

 
 

-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.  */
+Additional permission under GNU GPL version 3 section 7

 
 

-#include <config.h>
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
+
+#include "wget.h"

 
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 
 #include <stdio.h>
 #include <stdlib.h>
 #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>
+#ifdef ENABLE_NLS

 # include <locale.h>
 # include <locale.h>

-#endif /* HAVE_LOCALE_H */
-#endif /* HAVE_NLS */
+#endif

 #include <assert.h>
 #include <assert.h>

-

 #include <errno.h>
 #include <errno.h>

-#ifndef errno
-extern int errno;
-#endif
+#include <time.h>

 
 

-#include "wget.h"

 #include "utils.h"
 #include "init.h"
 #include "retr.h"
 #include "recur.h"
 #include "host.h"
 #include "utils.h"
 #include "init.h"
 #include "retr.h"
 #include "recur.h"
 #include "host.h"

-#include "cookies.h"

 #include "url.h"
 #include "url.h"

-#include "progress.h"          /* for progress_handle_sigwinch */
+#include "progress.h"           /* for progress_handle_sigwinch */

 #include "convert.h"
 #include "convert.h"

+#include "spider.h"
+#include "http.h"               /* for save_cookies */
+
+#include <getopt.h>
+#include <getpass.h>
+#include <quote.h>

 
 

-/* On GNU system this will include system-wide getopt.h. */
-#include "getopt.h"
+#ifdef __VMS
+#include "vms.h"
+#endif /* __VMS */

 
 #ifndef PATH_SEPARATOR
 # define PATH_SEPARATOR '/'
 
 #ifndef PATH_SEPARATOR
 # define PATH_SEPARATOR '/'


@@ -76,50 +69,49 @@ extern int errno;
 
 struct options opt;
 
 
 struct options opt;
 

-extern LARGE_INT total_downloaded_bytes;
+/* defined in version.c */

 extern char *version_string;
 extern char *version_string;

-
-extern struct cookie_jar *wget_cookie_jar;
-
-/* From log.c.  */
-void log_init PARAMS ((const char *, int));
-void log_close PARAMS ((void));
-void log_request_redirect_output PARAMS ((const char *));
-
-static RETSIGTYPE redirect_output_signal PARAMS ((int));
+extern char *compilation_string;
+extern char *system_getrc;
+extern char *link_string;
+/* defined in build_info.c */
+extern char *compiled_features[];
+/* Used for --version output in print_version */
+#define MAX_CHARS_PER_LINE      72
+#define TABULATION              4
+
+#if defined(SIGHUP) || defined(SIGUSR1)
+static void redirect_output_signal (int);
+#endif

 
 const char *exec_name;
 
 const char *exec_name;

+
+/* Number of successfully downloaded URLs */
+int numurls = 0;

 \f
 \f

-/* Initialize I18N.  The initialization amounts to invoking
-   setlocale(), bindtextdomain() and textdomain().
-   Does nothing if NLS is disabled or missing.  */
+#ifndef TESTING
+/* 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)
 {
 static void
 i18n_initialize (void)
 {

-  /* If HAVE_NLS is defined, assume the existence of the three
-     functions invoked here.  */
-#ifdef HAVE_NLS
+  /* ENABLE_NLS implies existence of functions invoked here.  */
+#ifdef ENABLE_NLS

   /* Set the current locale.  */
   /* 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
-  setlocale (LC_MESSAGES, "");
-  setlocale (LC_CTYPE, "");
-#else

   setlocale (LC_ALL, "");
   setlocale (LC_ALL, "");

-#endif

   /* Set the text message domain.  */
   bindtextdomain ("wget", LOCALEDIR);
   textdomain ("wget");
   /* Set the text message domain.  */
   bindtextdomain ("wget", LOCALEDIR);
   textdomain ("wget");

-#endif /* HAVE_NLS */
+#endif /* ENABLE_NLS */

 }
 \f
 /* Definition of command-line options. */
 
 }
 \f
 /* Definition of command-line options. */
 

+static void print_help (void);
+static void print_version (void);
+

 #ifdef HAVE_SSL
 # define IF_SSL(x) x
 #else
 #ifdef HAVE_SSL
 # define IF_SSL(x) x
 #else


@@ -127,9 +119,9 @@ i18n_initialize (void)
 #endif
 
 #ifdef ENABLE_DEBUG
 #endif
 
 #ifdef ENABLE_DEBUG

-# define IF_DEBUG(x) x
+# define WHEN_DEBUG(x) x

 #else
 #else

-# define IF_DEBUG(x) NULL
+# define WHEN_DEBUG(x) NULL

 #endif
 
 struct cmdline_option {
 #endif
 
 struct cmdline_option {


@@ -138,44 +130,55 @@ struct cmdline_option {
   enum {
     OPT_VALUE,
     OPT_BOOLEAN,
   enum {
     OPT_VALUE,
     OPT_BOOLEAN,

+    OPT_FUNCALL,

     /* Non-standard options that have to be handled specially in
        main().  */
     OPT__APPEND_OUTPUT,
     OPT__CLOBBER,
     /* Non-standard options that have to be handled specially in
        main().  */
     OPT__APPEND_OUTPUT,
     OPT__CLOBBER,

+    OPT__DONT_REMOVE_LISTING,

     OPT__EXECUTE,
     OPT__EXECUTE,

-    OPT__HELP,

     OPT__NO,
     OPT__NO,

-    OPT__PARENT,
-    OPT__VERSION
+    OPT__PARENT

   } type;
   } type;

-  const char *handle_cmd;      /* for standard options */
-  int argtype;                 /* for non-standard options */
+  const void *data;             /* for standard options */
+  int argtype;                  /* for non-standard options */

 };
 
 };
 

-struct cmdline_option option_data[] =
+static struct cmdline_option option_data[] =

   {
     { "accept", 'A', OPT_VALUE, "accept", -1 },
   {
     { "accept", 'A', OPT_VALUE, "accept", -1 },

+    { "adjust-extension", 'E', OPT_BOOLEAN, "adjustextension", -1 },

     { "append-output", 'a', OPT__APPEND_OUTPUT, NULL, required_argument },
     { "append-output", 'a', OPT__APPEND_OUTPUT, NULL, required_argument },

+    { "ask-password", 0, OPT_BOOLEAN, "askpassword", -1 },
+    { "auth-no-challenge", 0, OPT_BOOLEAN, "authnochallenge", -1 },

     { "background", 'b', OPT_BOOLEAN, "background", -1 },
     { "backup-converted", 'K', OPT_BOOLEAN, "backupconverted", -1 },
     { "backups", 0, OPT_BOOLEAN, "backups", -1 },
     { "base", 'B', OPT_VALUE, "base", -1 },
     { "bind-address", 0, OPT_VALUE, "bindaddress", -1 },
     { "background", 'b', OPT_BOOLEAN, "background", -1 },
     { "backup-converted", 'K', OPT_BOOLEAN, "backupconverted", -1 },
     { "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 },
     { "convert-links", 'k', OPT_BOOLEAN, "convertlinks", -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 },

+    { "content-disposition", 0, OPT_BOOLEAN, "contentdisposition", -1 },

     { "cookies", 0, OPT_BOOLEAN, "cookies", -1 },
     { "cut-dirs", 0, OPT_VALUE, "cutdirs", -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 },
+    { "default-page", 0, OPT_VALUE, "defaultpage", -1 },

     { "delete-after", 0, OPT_BOOLEAN, "deleteafter", -1 },
     { "directories", 0, OPT_BOOLEAN, "dirstruct", -1 },
     { "directory-prefix", 'P', OPT_VALUE, "dirprefix", -1 },
     { "dns-cache", 0, OPT_BOOLEAN, "dnscache", -1 },
     { "dns-timeout", 0, OPT_VALUE, "dnstimeout", -1 },
     { "domains", 'D', OPT_VALUE, "domains", -1 },
     { "delete-after", 0, OPT_BOOLEAN, "deleteafter", -1 },
     { "directories", 0, OPT_BOOLEAN, "dirstruct", -1 },
     { "directory-prefix", 'P', OPT_VALUE, "dirprefix", -1 },
     { "dns-cache", 0, OPT_BOOLEAN, "dnscache", -1 },
     { "dns-timeout", 0, OPT_VALUE, "dnstimeout", -1 },
     { "domains", 'D', OPT_VALUE, "domains", -1 },

-    { "dot-style", 0, OPT_VALUE, "dotstyle", -1 },
+    { "dont-remove-listing", 0, OPT__DONT_REMOVE_LISTING, NULL, no_argument },
+    { "dot-style", 0, OPT_VALUE, "dotstyle", -1 }, /* deprecated */

     { "egd-file", 0, OPT_VALUE, "egdfile", -1 },
     { "exclude-directories", 'X', OPT_VALUE, "excludedirectories", -1 },
     { "exclude-domains", 0, OPT_VALUE, "excludedomains", -1 },
     { "egd-file", 0, OPT_VALUE, "egdfile", -1 },
     { "exclude-directories", 'X', OPT_VALUE, "excludedirectories", -1 },
     { "exclude-domains", 0, OPT_VALUE, "excludedomains", -1 },


@@ -184,24 +187,38 @@ struct cmdline_option option_data[] =
     { "follow-tags", 0, OPT_VALUE, "followtags", -1 },
     { "force-directories", 'x', OPT_BOOLEAN, "dirstruct", -1 },
     { "force-html", 'F', OPT_BOOLEAN, "forcehtml", -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-password", 0, OPT_VALUE, "ftppassword", -1 },
+#ifdef __VMS
+    { "ftp-stmlf", 0, OPT_BOOLEAN, "ftpstmlf", -1 },
+#endif /* def __VMS */
+    { "ftp-user", 0, OPT_VALUE, "ftpuser", -1 },
+    { "glob", 0, OPT_BOOLEAN, "glob", -1 },

     { "header", 0, OPT_VALUE, "header", -1 },
     { "header", 0, OPT_VALUE, "header", -1 },

-    { "help", 'h', OPT__HELP, NULL, no_argument },
+    { "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },

     { "host-directories", 0, OPT_BOOLEAN, "addhostdir", -1 },
     { "host-directories", 0, OPT_BOOLEAN, "addhostdir", -1 },

-    { "html-extension", 'E', OPT_BOOLEAN, "htmlextension", -1 },
+    { "html-extension", 'E', OPT_BOOLEAN, "adjustextension", -1 },

     { "htmlify", 0, OPT_BOOLEAN, "htmlify", -1 },
     { "http-keep-alive", 0, OPT_BOOLEAN, "httpkeepalive", -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 },
     { "http-user", 0, OPT_VALUE, "httpuser", -1 },

+    { "ignore-case", 0, OPT_BOOLEAN, "ignorecase", -1 },

     { "ignore-length", 0, OPT_BOOLEAN, "ignorelength", -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 },
     { "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 },
     { "input-file", 'i', OPT_VALUE, "input", -1 },

+    { "iri", 0, OPT_BOOLEAN, "iri", -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 },
     { "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 },
+    { "local-encoding", 0, OPT_VALUE, "localencoding", -1 },
+    { "max-redirect", 0, OPT_VALUE, "maxredirect", -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 },
     { "no", 'n', OPT__NO, NULL, required_argument },
     { "no-clobber", 0, OPT_BOOLEAN, "noclobber", -1 },
     { "no-parent", 0, OPT_BOOLEAN, "noparent", -1 },


@@ -210,52 +227,63 @@ struct cmdline_option option_data[] =
     { "page-requisites", 'p', OPT_BOOLEAN, "pagerequisites", -1 },
     { "parent", 0, OPT__PARENT, NULL, optional_argument },
     { "passive-ftp", 0, OPT_BOOLEAN, "passiveftp", -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 },
     { "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 },
     { "progress", 0, OPT_VALUE, "progress", -1 },

-    { "proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 },
-    { "proxy-passwd", 0, OPT_VALUE, "proxypasswd", -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, "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 },
     { "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 },
     { "referer", 0, OPT_VALUE, "referer", -1 },
     { "reject", 'R', OPT_VALUE, "reject", -1 },
     { "relative", 'L', OPT_BOOLEAN, "relativeonly", -1 },
     { "random-wait", 0, OPT_BOOLEAN, "randomwait", -1 },
     { "read-timeout", 0, OPT_VALUE, "readtimeout", -1 },
     { "recursive", 'r', OPT_BOOLEAN, "recursive", -1 },
     { "referer", 0, OPT_VALUE, "referer", -1 },
     { "reject", 'R', OPT_VALUE, "reject", -1 },
     { "relative", 'L', OPT_BOOLEAN, "relativeonly", -1 },

+    { "remote-encoding", 0, OPT_VALUE, "remoteencoding", -1 },

     { "remove-listing", 0, OPT_BOOLEAN, "removelisting", -1 },
     { "restrict-file-names", 0, OPT_BOOLEAN, "restrictfilenames", -1 },
     { "retr-symlinks", 0, OPT_BOOLEAN, "retrsymlinks", -1 },
     { "retry-connrefused", 0, OPT_BOOLEAN, "retryconnrefused", -1 },
     { "save-cookies", 0, OPT_VALUE, "savecookies", -1 },
     { "save-headers", 0, OPT_BOOLEAN, "saveheaders", -1 },
     { "remove-listing", 0, OPT_BOOLEAN, "removelisting", -1 },
     { "restrict-file-names", 0, OPT_BOOLEAN, "restrictfilenames", -1 },
     { "retr-symlinks", 0, OPT_BOOLEAN, "retrsymlinks", -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 },
     { "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 },
     { "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 },
     { "user-agent", 'U', OPT_VALUE, "useragent", -1 },
     { "verbose", 'v', OPT_BOOLEAN, "verbose", -1 },
     { "verbose", 0, OPT_BOOLEAN, "verbose", -1 },

-    { "version", 'V', OPT__VERSION, "version", no_argument },
+    { "version", 'V', OPT_FUNCALL, (void *) print_version, no_argument },

     { "wait", 'w', OPT_VALUE, "wait", -1 },
     { "waitretry", 0, OPT_VALUE, "waitretry", -1 },
     { "wait", 'w', OPT_VALUE, "wait", -1 },
     { "waitretry", 0, OPT_VALUE, "waitretry", -1 },

+#ifdef MSDOS
+    { "wdebug", 0, OPT_BOOLEAN, "wdebug", -1 },
+#endif

   };
 
   };
 

-#undef IF_DEBUG
+#undef WHEN_DEBUG

 #undef IF_SSL
 
 #undef IF_SSL
 

+/* Return a string that contains S with "no-" prepended.  The string
+   is NUL-terminated and allocated off static storage at Wget
+   startup.  */
+

 static char *
 no_prefix (const char *s)
 {
 static char *
 no_prefix (const char *s)
 {


@@ -264,13 +292,10 @@ no_prefix (const char *s)
 
   char *cp = p;
   int size = 3 + strlen (s) + 1;  /* "no-STRING\0" */
 
   char *cp = p;
   int size = 3 + strlen (s) + 1;  /* "no-STRING\0" */

-

   if (p + size >= buffer + sizeof (buffer))
     abort ();
 
   if (p + size >= buffer + sizeof (buffer))
     abort ();
 

-  cp[0] = 'n';
-  cp[1] = 'o';
-  cp[2] = '-';
+  cp[0] = 'n', cp[1] = 'o', cp[2] = '-';

   strcpy (cp + 3, s);
   p += size;
   return cp;
   strcpy (cp + 3, s);
   p += size;
   return cp;


@@ -286,63 +311,71 @@ static unsigned char optmap[96];
 /* Marker for `--no-FOO' values in long_options.  */
 #define BOOLEAN_NEG_MARKER 1024
 
 /* Marker for `--no-FOO' values in long_options.  */
 #define BOOLEAN_NEG_MARKER 1024
 

+/* Initialize the long_options array used by getopt_long from the data
+   in option_data.  */
+

 static void
 init_switches (void)
 {
   char *p = short_options;
 static void
 init_switches (void)
 {
   char *p = short_options;

-  int i, o = 0;
+  size_t i, o = 0;

   for (i = 0; i < countof (option_data); i++)
     {
       struct cmdline_option *opt = &option_data[i];
       struct option *longopt;
 
       if (!opt->long_name)
   for (i = 0; i < countof (option_data); i++)
     {
       struct cmdline_option *opt = &option_data[i];
       struct option *longopt;
 
       if (!opt->long_name)

-       /* The option is disabled. */
-       continue;
+        /* The option is disabled. */
+        continue;

 
       longopt = &long_options[o++];
       longopt->name = opt->long_name;
       longopt->val = i;
       if (opt->short_name)
 
       longopt = &long_options[o++];
       longopt->name = opt->long_name;
       longopt->val = i;
       if (opt->short_name)

-       {
-         *p++ = opt->short_name;
-         optmap[opt->short_name - 32] = longopt - long_options;
-       }
+        {
+          *p++ = opt->short_name;
+          optmap[opt->short_name - 32] = longopt - long_options;
+        }

       switch (opt->type)
       switch (opt->type)

-       {
-       case OPT_VALUE:
-         longopt->has_arg = required_argument;
+        {
+        case OPT_VALUE:
+          longopt->has_arg = required_argument;

           if (opt->short_name)
           if (opt->short_name)

-           *p++ = ':';
-         break;
-       case OPT_BOOLEAN:
-         /* Don't specify optional arguments for boolean short
-            options.  They are evil 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
-            it doesn't allow an argument.  */
-         longopt = &long_options[o++];
-         longopt->name = no_prefix (opt->long_name);
-         longopt->has_arg = no_argument;
-         /* Mask the value so we'll be able to recognize that we're
-            dealing with the false value.  */
-         longopt->val = i | BOOLEAN_NEG_MARKER;
-         break;
-       default:
-         assert (opt->argtype != -1);
-         longopt->has_arg = opt->argtype;
-         if (opt->short_name)
-           {
-             if (longopt->has_arg == required_argument)
-               *p++ = ':';
-             /* Don't handle optional_argument */
-           }
-       }
+            *p++ = ':';
+          break;
+        case OPT_BOOLEAN:
+          /* 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
+             it doesn't allow an argument.  */
+          longopt = &long_options[o++];
+          longopt->name = no_prefix (opt->long_name);
+          longopt->has_arg = no_argument;
+          /* Mask the value so we'll be able to recognize that we're
+             dealing with the false value.  */
+          longopt->val = i | BOOLEAN_NEG_MARKER;
+          break;
+        default:
+          assert (opt->argtype != -1);
+          longopt->has_arg = opt->argtype;
+          if (opt->short_name)
+            {
+              if (longopt->has_arg == required_argument)
+                *p++ = ':';
+              /* Don't handle optional_argument */
+            }
+        }

     }
     }

-  xzero (long_options[o]);
+  /* Terminate short_options. */

   *p = '\0';
   *p = '\0';

+  /* No need for xzero(long_options[o]) because its storage is static
+     and it will be zeroed by default.  */
+  assert (o <= countof (long_options));

 }
 
 /* Print the usage message.  */
 }
 
 /* Print the usage message.  */


@@ -357,146 +390,484 @@ print_usage (void)
 static void
 print_help (void)
 {
 static void
 print_help (void)
 {

+  /* We split the help text this way to ease translation of individual
+     entries.  */
+  static const char *help[] = {
+    "\n",
+    N_("\
+Mandatory arguments to long options are mandatory for short options too.\n\n"),
+    N_("\
+Startup:\n"),
+    N_("\
+  -V,  --version           display the version of Wget and exit.\n"),
+    N_("\
+  -h,  --help              print this help.\n"),
+    N_("\
+  -b,  --background        go to background after startup.\n"),
+    N_("\
+  -e,  --execute=COMMAND   execute a `.wgetrc'-style command.\n"),
+    "\n",
+
+    N_("\
+Logging and input file:\n"),
+    N_("\
+  -o,  --output-file=FILE    log messages to FILE.\n"),
+    N_("\
+  -a,  --append-output=FILE  append messages to FILE.\n"),
+#ifdef ENABLE_DEBUG
+    N_("\
+  -d,  --debug               print lots of debugging information.\n"),
+#endif
+#ifdef MSDOS
+    N_("\
+       --wdebug              print Watt-32 debug output.\n"),
+#endif
+    N_("\
+  -q,  --quiet               quiet (no output).\n"),
+    N_("\
+  -v,  --verbose             be verbose (this is the default).\n"),
+    N_("\
+  -nv, --no-verbose          turn off verboseness, without being quiet.\n"),
+    N_("\
+  -i,  --input-file=FILE     download URLs found in local or external FILE.\n"),
+    N_("\
+  -F,  --force-html          treat input file as HTML.\n"),
+    N_("\
+  -B,  --base=URL            resolves HTML input-file links (-i -F)\n\
+                             relative to URL.\n"),
+    "\n",
+
+    N_("\
+Download:\n"),
+    N_("\
+  -t,  --tries=NUMBER            set number of retries to NUMBER (0 unlimits).\n"),
+    N_("\
+       --retry-connrefused       retry even if connection is refused.\n"),
+    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_("\
+  -c,  --continue                resume getting a partially-downloaded file.\n"),
+    N_("\
+       --progress=TYPE           select progress gauge type.\n"),
+    N_("\
+  -N,  --timestamping            don't re-retrieve files unless newer than\n\
+                                 local.\n"),
+    N_("\
+  -S,  --server-response         print server response.\n"),
+    N_("\
+       --spider                  don't download anything.\n"),
+    N_("\
+  -T,  --timeout=SECONDS         set all timeout values to SECONDS.\n"),
+    N_("\
+       --dns-timeout=SECS        set the DNS lookup timeout to SECS.\n"),
+    N_("\
+       --connect-timeout=SECS    set the connect timeout to SECS.\n"),
+    N_("\
+       --read-timeout=SECS       set the read timeout to SECS.\n"),
+    N_("\
+  -w,  --wait=SECONDS            wait SECONDS between retrievals.\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"),
+    N_("\
+       --no-proxy                explicitly turn off proxy.\n"),
+    N_("\
+  -Q,  --quota=NUMBER            set retrieval quota to NUMBER.\n"),
+    N_("\
+       --bind-address=ADDRESS    bind to ADDRESS (hostname or IP) on local host.\n"),
+    N_("\
+       --limit-rate=RATE         limit download rate to RATE.\n"),
+    N_("\
+       --no-dns-cache            disable caching DNS lookups.\n"),
+    N_("\
+       --restrict-file-names=OS  restrict chars in file names to ones OS allows.\n"),
+    N_("\
+       --ignore-case             ignore case when matching files/directories.\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_("\
+       --user=USER               set both ftp and http user to USER.\n"),
+    N_("\
+       --password=PASS           set both ftp and http password to PASS.\n"),
+    N_("\
+       --ask-password            prompt for passwords.\n"),
+    N_("\
+       --no-iri                  turn off IRI support.\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",
+
+    N_("\
+Directories:\n"),
+    N_("\
+  -nd, --no-directories           don't create directories.\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_("\
+       --cut-dirs=NUMBER          ignore NUMBER remote directory components.\n"),
+    "\n",
+
+    N_("\
+HTTP options:\n"),
+    N_("\
+       --http-user=USER        set http user to USER.\n"),
+    N_("\
+       --http-password=PASS    set http password to PASS.\n"),
+    N_("\
+       --no-cache              disallow server-cached data.\n"),
+    N_ ("\
+       --default-page=NAME     Change the default page name (normally\n\
+                               this is `index.html'.).\n"),
+    N_("\
+  -E,  --adjust-extension      save HTML/CSS documents with proper extensions.\n"),
+    N_("\
+       --ignore-length         ignore `Content-Length' header field.\n"),
+    N_("\
+       --header=STRING         insert STRING among the headers.\n"),
+    N_("\
+       --max-redirect          maximum redirections allowed per page.\n"),
+    N_("\
+       --proxy-user=USER       set USER as proxy username.\n"),
+    N_("\
+       --proxy-password=PASS   set PASS as proxy password.\n"),
+    N_("\
+       --referer=URL           include `Referer: URL' header in HTTP request.\n"),
+    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_("\
+       --no-cookies            don't use cookies.\n"),
+    N_("\
+       --load-cookies=FILE     load cookies from FILE before session.\n"),
+    N_("\
+       --save-cookies=FILE     save cookies to FILE after session.\n"),
+    N_("\
+       --keep-session-cookies  load and save session (non-permanent) cookies.\n"),
+    N_("\
+       --post-data=STRING      use the POST method; send STRING as the data.\n"),
+    N_("\
+       --post-file=FILE        use the POST method; send contents of FILE.\n"),
+    N_("\
+       --content-disposition   honor the Content-Disposition header when\n\
+                               choosing local file names (EXPERIMENTAL).\n"),
+    N_("\
+       --auth-no-challenge     send Basic HTTP authentication information\n\
+                               without first waiting for the server's\n\
+                               challenge.\n"),
+    "\n",
+
+#ifdef HAVE_SSL
+    N_("\
+HTTPS (SSL/TLS) options:\n"),
+    N_("\
+       --secure-protocol=PR     choose secure protocol, one of auto, SSLv2,\n\
+                                SSLv3, and TLSv1.\n"),
+    N_("\
+       --no-check-certificate   don't validate the server's certificate.\n"),
+    N_("\
+       --certificate=FILE       client certificate file.\n"),
+    N_("\
+       --certificate-type=TYPE  client certificate type, PEM or DER.\n"),
+    N_("\
+       --private-key=FILE       private key file.\n"),
+    N_("\
+       --private-key-type=TYPE  private key type, PEM or DER.\n"),
+    N_("\
+       --ca-certificate=FILE    file with the bundle of CA's.\n"),
+    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"),
+#ifdef __VMS
+    N_("\
+       --ftp-stmlf             Use Stream_LF format for all binary FTP files.\n"),
+#endif /* def __VMS */
+    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_("\
+       --no-passive-ftp        disable the \"passive\" transfer mode.\n"),
+    N_("\
+       --retr-symlinks         when recursing, get linked-to files (not dir).\n"),
+    "\n",
+
+    N_("\
+Recursive download:\n"),
+    N_("\
+  -r,  --recursive          specify recursive download.\n"),
+    N_("\
+  -l,  --level=NUMBER       maximum recursion depth (inf or 0 for infinite).\n"),
+    N_("\
+       --delete-after       delete files locally after downloading them.\n"),
+    N_("\
+  -k,  --convert-links      make links in downloaded HTML or CSS point to\n\
+                            local files.\n"),
+#ifdef __VMS
+    N_("\
+  -K,  --backup-converted   before converting file X, back up as X_orig.\n"),
+#else /* def __VMS */
+    N_("\
+  -K,  --backup-converted   before converting file X, back up as X.orig.\n"),
+#endif /* def __VMS [else] */
+    N_("\
+  -m,  --mirror             shortcut for -N -r -l inf --no-remove-listing.\n"),
+    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"),
+    "\n",
+
+    N_("\
+Recursive accept/reject:\n"),
+    N_("\
+  -A,  --accept=LIST               comma-separated list of accepted extensions.\n"),
+    N_("\
+  -R,  --reject=LIST               comma-separated list of rejected extensions.\n"),
+    N_("\
+  -D,  --domains=LIST              comma-separated list of accepted domains.\n"),
+    N_("\
+       --exclude-domains=LIST      comma-separated list of rejected domains.\n"),
+    N_("\
+       --follow-ftp                follow FTP links from HTML documents.\n"),
+    N_("\
+       --follow-tags=LIST          comma-separated list of followed HTML tags.\n"),
+    N_("\
+       --ignore-tags=LIST          comma-separated list of ignored HTML tags.\n"),
+    N_("\
+  -H,  --span-hosts                go to foreign hosts when recursive.\n"),
+    N_("\
+  -L,  --relative                  follow relative links only.\n"),
+    N_("\
+  -I,  --include-directories=LIST  list of allowed directories.\n"),
+    N_("\
+  -X,  --exclude-directories=LIST  list of excluded directories.\n"),
+    N_("\
+  -np, --no-parent                 don't ascend to the parent directory.\n"),
+    "\n",
+
+    N_("Mail bug reports and suggestions to <bug-wget@gnu.org>.\n")
+  };
+
+  size_t i;
+

   printf (_("GNU Wget %s, a non-interactive network retriever.\n"),
   printf (_("GNU Wget %s, a non-interactive network retriever.\n"),

-         version_string);
+          version_string);

   print_usage ();
   print_usage ();

-  /* Had to split this in parts, so the #@@#%# Ultrix compiler and cpp
-     don't bitch.  Also, it makes translation much easier.  */
-  fputs (_("\
-\n\
-Mandatory arguments to long options are mandatory for short options too.\n\
-\n"), stdout);
-  fputs (_("\
-Startup:\n\
-  -V,  --version           display the version of Wget and exit.\n\
-  -h,  --help              print this help.\n\
-  -b,  --background        go to background after startup.\n\
-  -e,  --execute=COMMAND   execute a `.wgetrc\'-style command.\n\
-\n"), stdout);
-  fputs (_("\
-Logging and input file:\n\
-  -o,  --output-file=FILE     log messages to FILE.\n\
-  -a,  --append-output=FILE   append messages to FILE.\n\
-  -d,  --debug                print debug output.\n\
-  -q,  --quiet                quiet (no output).\n\
-  -v,  --verbose              be verbose (this is the default).\n\
-  -nv, --non-verbose          turn off verboseness, without being quiet.\n\
-  -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\
-\n"),stdout);
-  fputs (_("\
-Download:\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\
-       --progress=TYPE          select progress gauge type.\n\
-  -N,  --timestamping           don\'t re-retrieve files unless newer than local.\n\
-  -S,  --server-response        print server response.\n\
-       --spider                 don\'t download anything.\n\
-  -T,  --timeout=SECONDS        set all timeout values to SECONDS.\n\
-       --dns-timeout=SECS       set the DNS lookup timeout to SECS.\n\
-       --connect-timeout=SECS   set the connect timeout to SECS.\n\
-       --read-timeout=SECS      set the read timeout to SECS.\n\
-  -w,  --wait=SECONDS           wait SECONDS between retrievals.\n\
-       --waitretry=SECONDS      wait 1...SECONDS between retries of a retrieval.\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\
-       --dns-cache=off          disable caching DNS lookups.\n\
-       --restrict-file-names=OS restrict chars in file names to ones OS allows.\n\
-\n"), stdout);
-  fputs (_("\
-Directories:\n\
-  -nd, --no-directories            don\'t create directories.\n\
-  -x,  --force-directories         force creation of directories.\n\
-  -nH, --no-host-directories       don\'t create host directories.\n\
-  -P,  --directory-prefix=PREFIX   save files to PREFIX/...\n\
-       --cut-dirs=NUMBER           ignore NUMBER remote directory components.\n\
-\n"), stdout);
-  fputs (_("\
-HTTP options:\n\
-       --http-user=USER      set http user to USER.\n\
-       --http-passwd=PASS    set http password to PASS.\n\
-  -C,  --cache=on/off        (dis)allow server-cached data (normally allowed).\n\
-  -E,  --html-extension      save all text/html documents with .html extension.\n\
-       --ignore-length       ignore `Content-Length\' header field.\n\
-       --header=STRING       insert STRING among the headers.\n\
-       --proxy-user=USER     set USER as proxy username.\n\
-       --proxy-passwd=PASS   set PASS as proxy password.\n\
-       --referer=URL         include `Referer: URL\' header in HTTP request.\n\
-  -s,  --save-headers        save the HTTP headers to file.\n\
-  -U,  --user-agent=AGENT    identify as AGENT instead of Wget/VERSION.\n\
-       --no-http-keep-alive  disable HTTP keep-alive (persistent connections).\n\
-       --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\
-       --keep-session-cookies  load and save session (non-permanent) cookies.\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 stored.\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);
+
+  for (i = 0; i < countof (help); i++)
+    fputs (_(help[i]), stdout);
+
+  exit (0);
+}
+
+/* Return a human-readable printed representation of INTERVAL,
+   measured in seconds.  */
+
+static char *
+secs_to_human_time (double interval)
+{
+  static char buf[32];
+  int secs = (int) (interval + 0.5);
+  int hours, mins, days;
+
+  days = secs / 86400, secs %= 86400;
+  hours = secs / 3600, secs %= 3600;
+  mins = secs / 60, secs %= 60;
+
+  if (days)
+    sprintf (buf, "%dd %dh %dm %ds", days, hours, mins, secs);
+  else if (hours)
+    sprintf (buf, "%dh %dm %ds", hours, mins, secs);
+  else if (mins)
+    sprintf (buf, "%dm %ds", mins, secs);
+  else
+    sprintf (buf, "%ss", print_decimal (interval));
+
+  return buf;
+}
+
+static char *
+prompt_for_password (void)
+{
+  if (opt.user)
+    printf (_("Password for user %s: "), quote (opt.user));
+  else
+    printf (_("Password: "));
+  return getpass("");
+}
+
+/* Function that prints the line argument while limiting it
+   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
+format_and_print_line (const char *prefix, const char *line,
+                       int line_length) 
+{
+  int remaining_chars;
+  char *line_dup, *token;
+  
+  assert (prefix != NULL);
+  assert (line != NULL);
+
+  line_dup = xstrdup (line);
+
+  if (line_length <= 0)
+    line_length = MAX_CHARS_PER_LINE - TABULATION;
+
+  printf ("%s", prefix);
+  remaining_chars = line_length;
+  /* We break on spaces. */
+  token = strtok (line_dup, " ");
+  while (token != NULL) 
+    {
+      /* If however a token is much larger than the maximum
+         line length, all bets are off and we simply print the
+         token on the next line. */
+      if (remaining_chars <= strlen (token)) 
+        {
+          printf ("\n%*c", TABULATION, ' ');
+          remaining_chars = line_length - TABULATION;
+        }
+      printf ("%s ", token);
+      remaining_chars -= strlen (token) + 1;  /* account for " " */
+      token = strtok (NULL, " ");
+    }
+
+  printf ("\n");
+
+  xfree (line_dup);
+}
+
+static void
+print_version (void)
+{
+  const char *wgetrc_title  = _("Wgetrc: ");
+  const char *locale_title  = _("Locale: ");
+  const char *compile_title = _("Compile: ");
+  const char *link_title    = _("Link: ");
+  char *line;
+  char *env_wgetrc, *user_wgetrc;
+  int i;
+
+#ifdef __VMS
+  printf (_("GNU Wget %s built on VMS %s %s.\n\n"),
+   version_string, vms_arch(), vms_vers());
+#else /* def __VMS */
+  printf (_("GNU Wget %s built on %s.\n\n"), version_string, OS_TYPE);
+#endif /* def __VMS */
+  /* compiled_features is a char*[]. We limit the characters per
+     line to MAX_CHARS_PER_LINE and prefix each line with a constant
+     number of spaces for proper alignment. */
+  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]);
+          line_length -= strlen (compiled_features[i]) + 2;
+          i++;
+        }
+      printf ("\n");
+    }
+  printf ("\n");
+  /* Handle the case when $WGETRC is unset and $HOME/.wgetrc is 
+     absent. */
+  printf ("%s\n", wgetrc_title);
+  env_wgetrc = wgetrc_env_file_name ();
+  if (env_wgetrc && *env_wgetrc) 
+    {
+      printf (_("    %s (env)\n"), env_wgetrc);
+      xfree (env_wgetrc);
+    }
+  user_wgetrc = wgetrc_user_file_name ();
+  if (user_wgetrc) 
+    {
+      printf (_("    %s (user)\n"), user_wgetrc);
+      xfree (user_wgetrc);
+    }
+#ifdef SYSTEM_WGETRC
+  printf (_("    %s (system)\n"), SYSTEM_WGETRC);

 #endif
 #endif

+
+  format_and_print_line (locale_title,
+                        LOCALEDIR, 
+                        MAX_CHARS_PER_LINE);
+  
+  format_and_print_line (compile_title,
+                        compilation_string,
+                        MAX_CHARS_PER_LINE);
+
+  format_and_print_line (link_title,
+                        link_string,
+                        MAX_CHARS_PER_LINE);
+
+  printf ("\n");
+  /* TRANSLATORS: When available, an actual copyright character
+     (cirle-c) should be used in preference to "(C)". */

   fputs (_("\
   fputs (_("\

-FTP options:\n\
-  -nr, --dont-remove-listing   don\'t remove `.listing\' files.\n\
-  -g,  --glob=on/off           turn file name globbing on or off.\n\
-       --passive-ftp           use the \"passive\" transfer mode.\n\
-       --retr-symlinks         when recursing, get linked-to files (not dirs).\n\
-\n"), stdout);
-  fputs (_("\
-Recursive retrieval:\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\
-  -K,  --backup-converted   before converting file X, back up as X.orig.\n\
-  -m,  --mirror             shortcut option equivalent to -r -N -l inf -nr.\n\
-  -p,  --page-requisites    get all images, etc. needed to display HTML page.\n\
-       --strict-comments    turn on strict (SGML) handling of HTML comments.\n\
-\n"), stdout);
+Copyright (C) 2009 Free Software Foundation, Inc.\n"), stdout);

   fputs (_("\
   fputs (_("\

-Recursive accept/reject:\n\
-  -A,  --accept=LIST                comma-separated list of accepted extensions.\n\
-  -R,  --reject=LIST                comma-separated list of rejected extensions.\n\
-  -D,  --domains=LIST               comma-separated list of accepted domains.\n\
-       --exclude-domains=LIST       comma-separated list of rejected domains.\n\
-       --follow-ftp                 follow FTP links from HTML documents.\n\
-       --follow-tags=LIST           comma-separated list of followed HTML tags.\n\
-  -G,  --ignore-tags=LIST           comma-separated list of ignored HTML tags.\n\
-  -H,  --span-hosts                 go to foreign hosts when recursive.\n\
-  -L,  --relative                   follow relative links only.\n\
-  -I,  --include-directories=LIST   list of allowed directories.\n\
-  -X,  --exclude-directories=LIST   list of excluded directories.\n\
-  -np, --no-parent                  don\'t ascend to the parent directory.\n\
-\n"), stdout);
-  fputs (_("Mail bug reports and suggestions to <bug-wget@gnu.org>.\n"),
-        stdout);
+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);
+  /* 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 (_("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);

 }
 }

-\f
+
+char *program_name; /* Needed by lib/error.c. */
+

 int
 int

-main (int argc, char *const *argv)
+main (int argc, char **argv)

 {
   char **url, **t;
   int i, ret, longindex;
   int nurl, status;
 {
   char **url, **t;
   int i, ret, longindex;
   int nurl, status;

-  int append_to_log = 0;
+  bool append_to_log = false;
+
+  program_name = argv[0];

 
   i18n_initialize ();
 
 
   i18n_initialize ();
 


@@ -508,7 +879,8 @@ main (int argc, char *const *argv)
     ++exec_name;
 
 #ifdef WINDOWS
     ++exec_name;
 
 #ifdef WINDOWS

-  windows_main_junk (&argc, (char **) argv, (char **) &exec_name);
+  /* Drop extension (typically .EXE) from executable filename. */
+  windows_main ((char **) &exec_name);

 #endif
 
   /* Set option defaults; read the system wgetrc and ~/.wgetrc.  */
 #endif
 
   /* Set option defaults; read the system wgetrc and ~/.wgetrc.  */


@@ -517,137 +889,135 @@ main (int argc, char *const *argv)
   init_switches ();
   longindex = -1;
   while ((ret = getopt_long (argc, argv,
   init_switches ();
   longindex = -1;
   while ((ret = getopt_long (argc, argv,

-                            short_options, long_options, &longindex)) != -1)
+                             short_options, long_options, &longindex)) != -1)

     {
       int val;
       struct cmdline_option *opt;
     {
       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
 
       /* If LONGINDEX is unchanged, it means RET is referring a short

-        option.  Look it up in the mapping table.  */
+         option.  */

       if (longindex == -1)
       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
       val = long_options[longindex].val;
 
       /* Use the retrieved value to locate the option in the

-        option_data array, and to see if we're dealing with the
-        negated "--no-FOO" variant of the boolean option "--foo".  */
+         option_data array, and to see if we're dealing with the
+         negated "--no-FOO" variant of the boolean option "--foo".  */

       opt = &option_data[val & ~BOOLEAN_NEG_MARKER];
       switch (opt->type)
       opt = &option_data[val & ~BOOLEAN_NEG_MARKER];
       switch (opt->type)

-       {
-       case OPT_VALUE:
-         setoptval (opt->handle_cmd, optarg);
-         break;
-       case OPT_BOOLEAN:
-         if (optarg)
-           /* The user has specified a value -- use it. */
-           setoptval (opt->handle_cmd, optarg);
-         else
-           {
-             /* NEG is true for `--no-FOO' style boolean options. */
-             int neg = val & BOOLEAN_NEG_MARKER;
-             setoptval (opt->handle_cmd, neg ? "0" : "1");
-           }
-         break;
-       case OPT__APPEND_OUTPUT:
-         setoptval ("logfile", optarg);
-         append_to_log = 1;
-         break;
-       case OPT__HELP:
-         print_help ();
-#ifdef WINDOWS
-         ws_help (exec_name);
-#endif
-         exit (0);
-         break;
-       case OPT__EXECUTE:
-         run_command (optarg);
-         break;
-       case OPT__NO:
-         {
-           /* We support real --no-FOO flags now, but keep these
-              short options for convenience and backward
-              compatibility.  */
-           char *p;
-           for (p = optarg; *p; p++)
-             switch (*p)
-               {
-               case 'v':
-                 setoptval ("verbose", "0");
-                 break;
-               case 'H':
-                 setoptval ("addhostdir", "0");
-                 break;
-               case 'd':
-                 setoptval ("dirstruct", "0");
-                 break;
-               case 'c':
-                 setoptval ("noclobber", "1");
-                 break;
-               case 'p':
-                 setoptval ("noparent", "1");
-                 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);
-                 exit (1);
-               }
-           break;
-         }
-       case OPT__PARENT:
-       case OPT__CLOBBER:
-         {
-           /* 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;
-           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");
-           break;
-         }
-       case OPT__VERSION:
-         printf ("GNU Wget %s\n\n", version_string);
-         printf ("%s", _("\
-Copyright (C) 2003 Free Software Foundation, Inc.\n"));
-         printf ("%s", _("\
-This program is distributed in the hope that it will be useful,\n\
-but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n\
-GNU General Public License for more details.\n"));
-         printf (_("\nOriginally written by Hrvoje Niksic <hniksic@xemacs.org>.\n"));
-         exit (0);
-         break;
-       }
+        {
+        case OPT_VALUE:
+          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, opt->long_name);
+          else
+            {
+              /* NEG is true for `--no-FOO' style boolean options. */
+              bool neg = !!(val & BOOLEAN_NEG_MARKER);
+              setoptval (opt->data, neg ? "0" : "1", opt->long_name);
+            }
+          break;
+        case OPT_FUNCALL:
+          {
+            void (*func) (void) = (void (*) (void)) opt->data;
+            func ();
+          }
+          break;
+        case OPT__APPEND_OUTPUT:
+          setoptval ("logfile", optarg, opt->long_name);
+          append_to_log = true;
+          break;
+        case OPT__EXECUTE:
+          run_command (optarg);
+          break;
+        case OPT__NO:
+          {
+            /* We support real --no-FOO flags now, but keep these
+               short options for convenience and backward
+               compatibility.  */
+            char *p;
+            for (p = optarg; *p; p++)
+              switch (*p)
+                {
+                case 'v':
+                  setoptval ("verbose", "0", opt->long_name);
+                  break;
+                case 'H':
+                  setoptval ("addhostdir", "0", opt->long_name);
+                  break;
+                case 'd':
+                  setoptval ("dirstruct", "0", opt->long_name);
+                  break;
+                case 'c':
+                  setoptval ("noclobber", "1", opt->long_name);
+                  break;
+                case 'p':
+                  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);
+                  exit (1);
+                }
+            break;
+          }
+        case OPT__PARENT:
+        case OPT__CLOBBER:
+          {
+            /* The wgetrc commands are named noparent and noclobber,
+               so we must revert the meaning of the cmdline options
+               before passing the value to setoptval.  */
+            bool flag = true;
+            if (optarg)
+              flag = (*optarg == '1' || c_tolower (*optarg) == 'y'
+                      || (c_tolower (optarg[0]) == 'o'
+                          && c_tolower (optarg[1]) == 'n'));
+            setoptval (opt->type == OPT__PARENT ? "noparent" : "noclobber",
+                       flag ? "0" : "1", opt->long_name);
+            break;
+          }
+        case OPT__DONT_REMOVE_LISTING:
+          setoptval ("removelisting", "0", opt->long_name);
+          break;
+        }

 
       longindex = -1;
     }
 
 
       longindex = -1;
     }
 

+  nurl = argc - optind;
+

   /* All user options have now been processed, so it's now safe to do
      interoption dependency checks. */
 
   if (opt.reclevel == 0)
   /* All user options have now been processed, so it's now safe to do
      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 */
+
+  if (opt.spider || opt.delete_after)
+      opt.no_dirstruct = true;

 
   if (opt.page_requisites && !opt.recursive)
     {
       /* Don't set opt.recursive here because it would confuse the FTP
 
   if (opt.page_requisites && !opt.recursive)
     {
       /* Don't set opt.recursive here because it would confuse the FTP

-        code.  Instead, call retrieve_tree below when either
-        page_requisites or recursive is requested.  */
+         code.  Instead, call retrieve_tree below when either
+         page_requisites or recursive is requested.  */

       opt.reclevel = 0;
       if (!opt.no_dirstruct)
       opt.reclevel = 0;
       if (!opt.no_dirstruct)

-       opt.dirstruct = 1;      /* normally handled by cmd_spec_recursive() */
+        opt.dirstruct = 1;      /* normally handled by cmd_spec_recursive() */

     }
 
   if (opt.verbose == -1)
     }
 
   if (opt.verbose == -1)


@@ -667,7 +1037,54 @@ Can't timestamp and not clobber old files at the same time.\n"));
       print_usage ();
       exit (1);
     }
       print_usage ();
       exit (1);
     }

-  nurl = argc - optind;
+#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
+  if (opt.output_document)
+    {
+      if (opt.convert_links 
+          && (nurl > 1 || opt.page_requisites || opt.recursive))
+        {
+          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 ();
+          exit (1);
+        }
+      if (opt.page_requisites
+          || opt.recursive)
+        {
+          logprintf (LOG_NOTQUIET, "%s", _("\
+WARNING: combining -O with -r or -p will mean that all downloaded content\n\
+will be placed in the single file you specified.\n\n"));
+        }
+      if (opt.timestamping)
+        {
+          logprintf (LOG_NOTQUIET, "%s", _("\
+WARNING: timestamping does nothing in combination with -O. See the manual\n\
+for details.\n\n"));
+          opt.timestamping = false;
+        }
+      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);
+              exit(1);
+           }  
+    }
+
+  if (opt.ask_passwd && opt.passwd)
+    {
+      printf (_("Cannot specify both --ask-password and --password.\n"));
+      print_usage ();
+      exit (1);
+    }
+

   if (!nurl && !opt.input_filename)
     {
       /* No URL specified.  */
   if (!nurl && !opt.input_filename)
     {
       /* No URL specified.  */


@@ -675,13 +1092,48 @@ Can't timestamp and not clobber old files at the same time.\n"));
       print_usage ();
       printf ("\n");
       /* #### Something nicer should be printed here -- similar to the
       print_usage ();
       printf ("\n");
       /* #### Something nicer should be printed here -- similar to the

-        pre-1.5 `--help' page.  */
+         pre-1.5 `--help' page.  */

       printf (_("Try `%s --help' for more options.\n"), exec_name);
       exit (1);
     }
 
       printf (_("Try `%s --help' for more options.\n"), exec_name);
       exit (1);
     }
 

+#ifdef ENABLE_IRI
+  if (opt.enable_iri)
+    {
+      if (opt.locale && !check_encoding_name (opt.locale))
+        opt.locale = NULL;
+
+      if (!opt.locale)
+        opt.locale = find_locale ();
+
+      if (opt.encoding_remote && !check_encoding_name (opt.encoding_remote))
+        opt.encoding_remote = NULL;
+    }
+#else
+  if (opt.enable_iri || opt.locale || opt.encoding_remote)
+    {
+      /* sXXXav : be more specific... */
+      printf(_("This version does not have support for IRIs\n"));
+      exit(1);
+    }
+#endif
+
+  if (opt.ask_passwd)
+    {
+      opt.passwd = prompt_for_password ();
+
+      if (opt.passwd == NULL || opt.passwd[0] == '\0')
+        exit (1);
+    }
+
+#ifdef MSDOS
+  if (opt.wdebug)
+     dbug_init();
+  sock_init();
+#else

   if (opt.background)
     fork_to_background ();
   if (opt.background)
     fork_to_background ();

+#endif

 
   /* Initialize progress.  Have to do this after the options are
      processed so we know where the log file is.  */
 
   /* Initialize progress.  Have to do this after the options are
      processed so we know where the log file is.  */


@@ -694,86 +1146,164 @@ Can't timestamp and not clobber old files at the same time.\n"));
     {
       char *rewritten = rewrite_shorthand_url (argv[optind]);
       if (rewritten)
     {
       char *rewritten = rewrite_shorthand_url (argv[optind]);
       if (rewritten)

-       url[i] = rewritten;
+        url[i] = rewritten;

       else
       else

-       url[i] = xstrdup (argv[optind]);
+        url[i] = xstrdup (argv[optind]);

     }
   url[i] = NULL;
 
     }
   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);
 
   /* Initialize logging.  */
   log_init (opt.lfilename, append_to_log);
 

-  DEBUGP (("DEBUG output created by Wget %s on %s.\n\n", version_string,
-          OS_TYPE));
+  DEBUGP (("DEBUG output created by Wget %s on %s.\n\n",
+           version_string, OS_TYPE));

 
   /* Open the output filename if necessary.  */
 
   /* Open the output filename if necessary.  */

+
+/* 2005-04-17 SMS.
+   Note that having the output_stream ("-O") file opened here for an FTP
+   URL rather than in getftp() (ftp.c) (and the http equivalent) rather
+   limits the ability in VMS to open the file differently for ASCII
+   versus binary FTP there.  (Of course, doing it here allows a open
+   failure to be detected immediately, without first connecting to the
+   server.)
+*/

   if (opt.output_document)
     {
       if (HYPHENP (opt.output_document))
   if (opt.output_document)
     {
       if (HYPHENP (opt.output_document))

-       opt.dfp = stdout;
+        {
+#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"));
+            }
+#endif
+          output_stream = stdout;
+        }

       else
       else

-       {
-         struct stat st;
-         opt.dfp = fopen (opt.output_document, opt.always_rest ? "ab" : "wb");
-         if (opt.dfp == NULL)
-           {
-             perror (opt.output_document);
-             exit (1);
-           }
-         if (fstat (fileno (opt.dfp), &st) == 0 && S_ISREG (st.st_mode))
-           opt.od_known_regular = 1;
-       }
+        {
+          struct_fstat st;
+
+#ifdef __VMS
+/* Common fopen() optional arguments:
+   sequential access only, access callback function.
+*/
+# define FOPEN_OPT_ARGS , "fop=sqo", "acc", acc_cb, &open_id
+          int open_id = 7;
+#else /* def __VMS */
+# define FOPEN_OPT_ARGS
+#endif /* def __VMS [else] */
+
+          output_stream = fopen (opt.output_document,
+                                 opt.always_rest ? "ab" : "wb"
+                                 FOPEN_OPT_ARGS);
+          if (output_stream == NULL)
+            {
+              perror (opt.output_document);
+              exit (1);
+            }
+          if (fstat (fileno (output_stream), &st) == 0 && S_ISREG (st.st_mode))
+            output_stream_regular = true;
+        }

     }
 
     }
 

+#ifdef __VMS
+  /* Set global ODS5 flag according to the specified destination (if
+     any), otherwise according to the current default device.
+  */
+  if (output_stream == NULL)
+    {
+      set_ods5_dest( "SYS$DISK");
+    }
+  else if (output_stream != stdout)
+    {
+      set_ods5_dest( opt.output_document);
+    }
+#endif /* def __VMS */
+

 #ifdef WINDOWS
   ws_startup ();
 #endif
 
 #ifdef WINDOWS
   ws_startup ();
 #endif
 

+#ifdef SIGHUP

   /* Setup the signal handler to redirect output when hangup is
      received.  */
   /* 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);
   if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
     signal(SIGHUP, redirect_output_signal);

+#endif

   /* ...and do the same for SIGUSR1.  */
   /* ...and do the same for SIGUSR1.  */

+#ifdef SIGUSR1

   signal (SIGUSR1, redirect_output_signal);
   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);
   /* 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
 #ifdef SIGWINCH
   signal (SIGWINCH, progress_handle_sigwinch);
 #endif

-#endif /* HAVE_SIGNAL */

 
 

-  status = RETROK;             /* initialize it, just-in-case */
+  status = RETROK;              /* initialize it, just-in-case */

   /* Retrieve the URLs from argument list.  */
   for (t = url; *t; t++)
     {
       char *filename = NULL, *redirected_URL = NULL;
   /* Retrieve the URLs from argument list.  */
   for (t = url; *t; t++)
     {
       char *filename = NULL, *redirected_URL = NULL;

-      int dt;
-
-      if ((opt.recursive || opt.page_requisites)
-         && url_scheme (*t) != SCHEME_FTP)
-       status = retrieve_tree (*t);
+      int dt, url_err;
+      /* Need to do a new struct iri every time, because
+       * retrieve_url may modify it in some circumstances,
+       * currently. */
+      struct iri *iri = iri_new ();
+      struct url *url_parsed;
+
+      set_uri_encoding (iri, opt.locale, true);
+      url_parsed = url_parse (*t, &url_err, iri, true);
+
+      if (!url_parsed)
+        {
+          char *error = url_error (*t, url_err);
+          logprintf (LOG_NOTQUIET, "%s: %s.\n",*t, error);
+          xfree (error);
+          status = URLERROR;
+        }

       else
       else

-       status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
-
-      if (opt.delete_after && file_exists_p(filename))
-       {
-         DEBUGP (("Removing file due to --delete-after in main():\n"));
-         logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename);
-         if (unlink (filename))
-           logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
-       }
-
-      xfree_null (redirected_URL);
-      xfree_null (filename);
+        {
+          if ((opt.recursive || opt.page_requisites)
+              && (url_scheme (*t) != SCHEME_FTP || url_uses_proxy (url_parsed)))
+            {
+              int old_follow_ftp = opt.follow_ftp;
+
+              /* Turn opt.follow_ftp on in case of recursive FTP retrieval */
+              if (url_scheme (*t) == SCHEME_FTP) 
+                opt.follow_ftp = 1;
+          
+              status = 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);
+          }
+
+          if (opt.delete_after && file_exists_p(filename))
+            {
+              DEBUGP (("Removing file due to --delete-after in main():\n"));
+              logprintf (LOG_VERBOSE, _("Removing %s.\n"), filename);
+              if (unlink (filename))
+                logprintf (LOG_NOTQUIET, "unlink: %s\n", strerror (errno));
+            }
+          xfree_null (redirected_URL);
+          xfree_null (filename);
+          url_free (url_parsed);
+        }
+      iri_free (iri);

     }
 
   /* And then from the input file, if any.  */
     }
 
   /* And then from the input file, if any.  */


@@ -782,27 +1312,39 @@ Can't timestamp and not clobber old files at the same time.\n"));
       int count;
       status = retrieve_from_file (opt.input_filename, opt.force_html, &count);
       if (!count)
       int count;
       status = retrieve_from_file (opt.input_filename, opt.force_html, &count);
       if (!count)

-       logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"),
-                  opt.input_filename);
+        logprintf (LOG_NOTQUIET, _("No URLs found in %s.\n"),
+                   opt.input_filename);

     }
     }

+
+  /* Print broken links. */
+  if (opt.recursive && opt.spider)
+    {
+      print_broken_links();
+    }
+  

   /* Print the downloaded sum.  */
   /* Print the downloaded sum.  */

-  if (opt.recursive || opt.page_requisites
-      || nurl > 1
-      || (opt.input_filename && total_downloaded_bytes != 0))
+  if ((opt.recursive || opt.page_requisites
+       || nurl > 1
+       || (opt.input_filename && total_downloaded_bytes != 0))
+      &&
+      total_downloaded_bytes != 0)

     {
       logprintf (LOG_NOTQUIET,
     {
       logprintf (LOG_NOTQUIET,

-                _("\nFINISHED --%s--\nDownloaded: %s bytes in %d files\n"),
-                time_str (NULL), legible_large_int (total_downloaded_bytes),
-                opt.numurls);
+                 _("FINISHED --%s--\nDownloaded: %d files, %s in %s (%s)\n"),
+                 datetime_str (time (NULL)),
+                 numurls,
+                 human_readable (total_downloaded_bytes),
+                 secs_to_human_time (total_download_time),
+                 retr_rate (total_downloaded_bytes, total_download_time));

       /* Print quota warning, if exceeded.  */
       if (opt.quota && total_downloaded_bytes > opt.quota)
       /* 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));
+        logprintf (LOG_NOTQUIET,
+                   _("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 ();
 
   if (opt.convert_links && !opt.delete_after)
     convert_all_links ();


@@ -812,32 +1354,39 @@ Can't timestamp and not clobber old files at the same time.\n"));
     xfree (url[i]);
   cleanup ();
 
     xfree (url[i]);
   cleanup ();
 

-#ifdef DEBUG_MALLOC
-  print_malloc_debug_stats ();
-#endif

   if (status == RETROK)
     return 0;
   else
     return 1;
 }
   if (status == RETROK)
     return 0;
   else
     return 1;
 }

+#endif /* TESTING */

 \f
 \f

-#ifdef HAVE_SIGNAL
+#if defined(SIGHUP) || defined(SIGUSR1)
+
+/* So the signal_name check doesn't blow when only one is available. */
+#ifndef SIGHUP
+# define SIGHUP -1
+#endif
+#ifndef SIGUSR1
+# define SIGUSR1 -1
+#endif
+

 /* Hangup signal handler.  When wget receives SIGHUP or SIGUSR1, it
    will proceed operation as usual, trying to write into a log file.
 /* 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.
+   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.  */
-
-static RETSIGTYPE
+static void

 redirect_output_signal (int sig)
 {
 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);
 }
   log_request_redirect_output (signal_name);
   progress_schedule_redirect ();
   signal (sig, redirect_output_signal);
 }

-#endif /* HAVE_SIGNAL */
+#endif
+
+/*
+ * vim: et ts=2 sw=2
+ */