[svn] Commit several minor changes:

[wget] / src / main.c

diff --git a/src/main.c b/src/main.c
index 7069055197f514e3caa81486ed8881730e96033d..8189f644c2d8d8111e803061fdc7680eafca8671 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -102,7 +102,6 @@ i18n_initialize (void)
 
 /* It's kosher to declare these here because their interface _has_ to
    be void foo(void).  */
-void url_init PARAMS ((void));
 void host_init PARAMS ((void));
 
 /* This just calls the various initialization functions from the
@@ -110,7 +109,6 @@ void host_init PARAMS ((void));
 static void
 private_initialize (void)
 {
-  url_init ();
   host_init ();
 }
 \f
@@ -194,7 +192,8 @@ HTTP options:\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\
-       --cookies=no         don't use cookies.\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\
 \n"), stdout);
@@ -249,11 +248,9 @@ main (int argc, char *const *argv)
     { "backup-converted", no_argument, NULL, 'K' },
     { "continue", no_argument, NULL, 'c' },
     { "convert-links", no_argument, NULL, 'k' },
-    { "cookies", no_argument, NULL, 160 },
     { "debug", no_argument, NULL, 'd' },
     { "delete-after", no_argument, NULL, 136 },
     { "dont-remove-listing", no_argument, NULL, 149 },
-    { "email-address", no_argument, NULL, 154 }, /* undocumented (debug) */
     { "follow-ftp", no_argument, NULL, 142 },
     { "force-directories", no_argument, NULL, 'x' },
     { "force-hier", no_argument, NULL, 'x' }, /* obsolete */
@@ -290,7 +287,7 @@ main (int argc, char *const *argv)
     { "base", required_argument, NULL, 'B' },
     { "bind-address", required_argument, NULL, 155 },
     { "cache", required_argument, NULL, 'C' },
-    { "cookie-file", required_argument, NULL, 161 },
+    { "cookies", required_argument, NULL, 160 },
     { "cut-dirs", required_argument, NULL, 145 },
     { "directory-prefix", required_argument, NULL, 'P' },
     { "domains", required_argument, NULL, 'D' },
@@ -308,7 +305,7 @@ main (int argc, char *const *argv)
     { "include-directories", required_argument, NULL, 'I' },
     { "input-file", required_argument, NULL, 'i' },
     { "level", required_argument, NULL, 'l' },
-    { "load-cookies", required_argument, NULL, 162 },
+    { "load-cookies", required_argument, NULL, 161 },
     { "no", required_argument, NULL, 'n' },
     { "output-document", required_argument, NULL, 'O' },
     { "output-file", required_argument, NULL, 'o' },
@@ -317,7 +314,7 @@ main (int argc, char *const *argv)
     { "proxy-user", required_argument, NULL, 143 },
     { "quota", required_argument, NULL, 'Q' },
     { "reject", required_argument, NULL, 'R' },
-    { "save-cookies", required_argument, NULL, 163 },
+    { "save-cookies", required_argument, NULL, 162 },
     { "timeout", required_argument, NULL, 'T' },
     { "tries", required_argument, NULL, 't' },
     { "user-agent", required_argument, NULL, 'U' },
@@ -403,11 +400,6 @@ hpVqvdkKsxmNWrHSLcFbEY:G:g:T:U:O:l:n:i:o:a:t:D:A:R:P:B:e:Q:X:I:w:C:",
        case 150:
          setval ("simplehostcheck", "on");
          break;
-       case 154:
-         /* For debugging purposes.  */
-         printf ("%s\n", ftp_getaddress ());
-         exit (0);
-         break;
        case 155:
          setval ("bindaddress", optarg);
          break;
@@ -528,20 +520,13 @@ GNU General Public License for more details.\n"));
          setval ("followtags", optarg);
          break;
        case 160:
-         setval ("cookies", "on");
+         setval ("cookies", optarg);
          break;
        case 161:
-         setval ("cookies", "on");
-         setval ("cookiein", optarg);
-         setval ("cookieout", optarg);
+         setval ("loadcookies", optarg);
          break;
        case 162:
-         setval ("cookies", "on");
-         setval ("cookiein", optarg);
-         break;
-       case 163:
-         setval ("cookies", "on");
-         setval ("cookieout", optarg);
+         setval ("savecookies", optarg);
          break;
        case 157:
          setval ("referer", optarg);
@@ -792,9 +777,6 @@ Can't timestamp and not clobber old files at the same time.\n"));
   ws_startup ();
 #endif
 
-  if (opt.cookies_input)
-      load_cookies (opt.cookies_input);
-
   /* Setup the signal handler to redirect output when hangup is
      received.  */
 #ifdef HAVE_SIGNAL