[svn] Resurrect opt.dot_style.

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index 79e17af05bf729de694a39c9cba614e11ae31fd2..5dc9bb0332da9dd9533606769ca4029e5078e29e 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -104,18 +104,6 @@ i18n_initialize (void)
   textdomain ("wget");
 #endif /* HAVE_NLS */
 }
-
-/* It's kosher to declare these here because their interface _has_ to
-   be void foo(void).  */
-void host_init PARAMS ((void));
-
-/* This just calls the various initialization functions from the
-   modules that need one-time initialization. */
-static void
-private_initialize (void)
-{
-  host_init ();
-}
 \f
 /* Print the usage message.  */
 static void
@@ -173,8 +161,10 @@ Download:\n\
   -T,  --timeout=SECONDS        set the read timeout to SECONDS.\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\
+       --limit-rate=RATE        limit download rate to RATE.\n\
 \n"), stdout);
   fputs (_("\
 Directories:\n\
@@ -273,6 +263,7 @@ main (int argc, char *const *argv)
     { "passive-ftp", no_argument, NULL, 139 },
     { "page-requisites", no_argument, NULL, 'p' },
     { "quiet", no_argument, NULL, 'q' },
+    { "random-wait", no_argument, NULL, 165 },
     { "recursive", no_argument, NULL, 'r' },
     { "relative", no_argument, NULL, 'L' },
     { "retr-symlinks", no_argument, NULL, 137 },
@@ -309,6 +300,7 @@ main (int argc, char *const *argv)
     { "include-directories", required_argument, NULL, 'I' },
     { "input-file", required_argument, NULL, 'i' },
     { "level", required_argument, NULL, 'l' },
+    { "limit-rate", required_argument, NULL, 164 },
     { "load-cookies", required_argument, NULL, 161 },
     { "no", required_argument, NULL, 'n' },
     { "output-document", required_argument, NULL, 'O' },
@@ -335,7 +327,6 @@ main (int argc, char *const *argv)
   };
 
   i18n_initialize ();
-  private_initialize ();
 
   append_to_log = 0;
 
@@ -408,6 +399,9 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:",
        case 156:
          setval ("httpkeepalive", "off");
          break;
+       case 165:
+         setval ("randomwait", "on");
+         break;
        case 'b':
          setval ("background", "on");
          break;
@@ -498,13 +492,7 @@ GNU General Public License for more details.\n"));
          setval ("header", optarg);
          break;
        case 134:
-         /* Supported for compatibility; --dot-style=foo equivalent
-            to --progress=dot:foo.  */
-         {
-           char *tmp = alloca (3 + 1 + strlen (optarg));
-           sprintf (tmp, "dot:%s", optarg);
-           setval ("progress", tmp);
-         }
+         setval ("dotstyle", optarg);
          break;
        case 135:
          setval ("htmlify", optarg);
@@ -539,6 +527,9 @@ GNU General Public License for more details.\n"));
        case 163:
          setval ("progress", optarg);
          break;
+       case 164:
+         setval ("limitrate", optarg);
+         break;
        case 157:
          setval ("referer", optarg);
          break;