[svn] Resurrect opt.dot_style.

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index b5bbc1e580aade719fba33be1a14b59593c0eebb..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;
 
@@ -402,15 +393,15 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:",
        case 149:
          setval ("removelisting", "off");
          break;
-       case 150:
-         setval ("simplehostcheck", "on");
-         break;
        case 155:
          setval ("bindaddress", optarg);
          break;
        case 156:
          setval ("httpkeepalive", "off");
          break;
+       case 165:
+         setval ("randomwait", "on");
+         break;
        case 'b':
          setval ("background", "on");
          break;
@@ -501,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);
@@ -542,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;
@@ -604,7 +592,7 @@ GNU General Public License for more details.\n"));
          break;
        case 'n':
          {
-           /* #### The n? options are utter crock!  */
+           /* #### What we really want here is --no-foo. */
            char *p;
 
            for (p = optarg; *p; p++)
@@ -613,9 +601,6 @@ GNU General Public License for more details.\n"));
                case 'v':
                  setval ("verbose", "off");
                  break;
-               case 'h':
-                 setval ("simplehostcheck", "on");
-                 break;
                case 'H':
                  setval ("addhostdir", "off");
                  break;
@@ -686,6 +671,11 @@ GNU General Public License for more details.\n"));
        }
     }
 
+  /* Initialize progress.  Have to do this after the options are
+     processed so we know where the log file is.  */
+  if (opt.verbose)
+    set_progress_implementation (opt.progress_type);
+
   /* All user options have now been processed, so it's now safe to do
      interoption dependency checks. */
 
@@ -801,17 +791,17 @@ Can't timestamp and not clobber old files at the same time.\n"));
 #endif /* HAVE_SIGNAL */
 
   status = RETROK;             /* initialize it, just-in-case */
-  recursive_reset ();
+  /*recursive_reset ();*/
   /* Retrieve the URLs from argument list.  */
   for (t = url; *t; t++)
     {
-      char *filename, *redirected_URL;
+      char *filename = NULL, *redirected_URL = NULL;
       int dt;
 
-      status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
-      if (opt.recursive && status == RETROK && (dt & TEXTHTML))
-       status = recursive_retrieve (filename,
-                                    redirected_URL ? redirected_URL : *t);
+      if (opt.recursive && url_scheme (*t) != SCHEME_FTP)
+       status = retrieve_tree (*t);
+      else
+       status = retrieve_url (*t, &filename, &redirected_URL, NULL, &dt);
 
       if (opt.delete_after && file_exists_p(filename))
        {