From: hniksic <devnull@localhost>
Date: Sat, 8 Nov 2003 20:13:24 +0000 (-0800)
Subject: [svn] Added --dont-remove-listing, removed -s.
X-Git-Tag: v1.13~1440
X-Git-Url: http://sjero.net/git/?p=wget;a=commitdiff_plain;h=439d6a11fa16967b947ff99e35fb1fa61dd5b85f

[svn] Added --dont-remove-listing, removed -s.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2c4494a1..a5edfc06 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* main.c (main): Add --dont-remove-listing for backward
+	compatibility with previous versions.
+	(print_help): Fix typo, spotted by Dennis Smit.
+
 2003-11-08  Gisle Vanem  <giva@bgnett.no>
 
 	* ftp-basic.c: Support Windows-2000 ftp servers. Win-2000 *is*
diff --git a/src/main.c b/src/main.c
index a3ad522d..88552c71 100644
--- a/src/main.c
+++ b/src/main.c
@@ -140,6 +140,7 @@ struct cmdline_option {
        main().  */
     OPT__APPEND_OUTPUT,
     OPT__CLOBBER,
+    OPT__DONT_REMOVE_LISTING,
     OPT__EXECUTE,
     OPT__NO,
     OPT__PARENT,
@@ -171,6 +172,7 @@ struct cmdline_option option_data[] =
     { "dns-cache", 0, OPT_BOOLEAN, "dnscache", -1 },
     { "dns-timeout", 0, OPT_VALUE, "dnstimeout", -1 },
     { "domains", 'D', OPT_VALUE, "domains", -1 },
+    { "dont-remove-listing", 0, OPT__DONT_REMOVE_LISTING, NULL, no_argument },
     { "dot-style", 0, OPT_VALUE, "dotstyle", -1 },
     { "egd-file", 0, OPT_VALUE, "egdfile", -1 },
     { "exclude-directories", 'X', OPT_VALUE, "excludedirectories", -1 },
@@ -488,7 +490,7 @@ HTTP options:\n"),
     N_("\
        --referer=URL           include `Referer: URL' header in HTTP request.\n"),
     N_("\
-  -s,  --save-headers          save the HTTP headers to file.\n"),
+       --save-headers          save the HTTP headers to file.\n"),
     N_("\
   -U,  --user-agent=AGENT      identify as AGENT instead of Wget/VERSION.\n"),
     N_("\
@@ -523,7 +525,7 @@ HTTPS (SSL) options:\n"),
     N_("\
        --sslcerttype=0/1     Client-Cert type 0=PEM (default) / 1=ASN1 (DER)\n"),
     N_("\
-       --sslcheckcert=0/1    Check the server cert agenst given CA\n"),
+       --sslcheckcert=0/1    Check the server cert against given CA\n"),
     N_("\
        --sslprotocol=0-3     choose SSL protocol; 0=automatic,\n"),
     N_("\
@@ -753,6 +755,9 @@ main (int argc, char *const *argv)
 		       flag ? "0" : "1");
 	    break;
 	  }
+	case OPT__DONT_REMOVE_LISTING:
+	  setoptval ("removelisting", "0");
+	  break;
 	}
 
       longindex = -1;