[svn] Added reordering of addresses to try IPv4 first and the associated

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index 432c7d4804a673fdc090fd572fc29ee193298eae..4d2163abfca5fd96e1f637c770c6457b594b5496 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -214,6 +214,7 @@ struct cmdline_option option_data[] =
     { "passive-ftp", 0, OPT_BOOLEAN, "passiveftp", -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 },
     { "progress", 0, OPT_VALUE, "progress", -1 },
     { "protocol-directories", 0, OPT_BOOLEAN, "protocoldirectories", -1 },
@@ -465,6 +466,9 @@ Download:\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",
 
@@ -531,8 +535,6 @@ HTTPS (SSL) options:\n"),
        --sslcertfile=FILE    optional client certificate.\n"),
     N_("\
        --sslcertkey=KEYFILE  optional keyfile for this certificate.\n"),
-    N_("\
-       --egd-file=FILE       file name of the EGD socket.\n"),
     N_("\
        --sslcadir=DIR        dir where hash list of CA's are stored.\n"),
     N_("\
@@ -544,6 +546,8 @@ HTTPS (SSL) options:\n"),
     N_("\
        --sslprotocol=0-3     choose SSL protocol; 0=automatic,\n\
                              1=SSLv2 2=SSLv3 3=TLSv1.\n"),
+    N_("\
+       --egd-file=FILE       file name of the EGD socket.\n"),
     "\n",
 #endif /* HAVE_SSL */
 
@@ -943,13 +947,13 @@ Can't timestamp and not clobber old files at the same time.\n"));
     {
       logprintf (LOG_NOTQUIET,
                 _("\nFINISHED --%s--\nDownloaded: %s bytes in %d files\n"),
-                time_str (NULL), legible_large_int (total_downloaded_bytes),
+                time_str (NULL), with_thousand_seps_large (total_downloaded_bytes),
                 opt.numurls);
       /* Print quota warning, if exceeded.  */
       if (opt.quota && total_downloaded_bytes > opt.quota)
        logprintf (LOG_NOTQUIET,
                   _("Download quota (%s bytes) EXCEEDED!\n"),
-                  legible (opt.quota));
+                  with_thousand_seps_large (opt.quota));
     }
 
   if (opt.cookies_output)