Mark some options as deprecated.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0c60ebfb1869e29ebe6b886e2f2eea47c88be5c1..5981e779cbeb51afba5b2cb344bc6cf3365a85be 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-08  Steven Schubiger  <stsc@member.fsf.org>
+
+       * main.c, init.c: Mark the --preserve-permissions and 
+       --html-extension option as deprecated.
+
 2009-09-06  Micah Cowan  <micah@cowan.name>
 
        * ftp.c (getftp, ftp_loop_internal): Separate "len" input/output

diff --git a/src/init.c b/src/init.c
index 7708e275461d752b72f28d9449f7a82a200df092..91512e847e4dd04fdcec71aeb1db9fbb4bde0fdb 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -164,7 +164,7 @@ static const struct {
   { "ftpuser",          &opt.ftp_user,          cmd_string },
   { "glob",             &opt.ftp_glob,          cmd_boolean },
   { "header",           NULL,                   cmd_spec_header },
-  { "htmlextension",    &opt.adjust_extension,  cmd_boolean },
+  { "htmlextension",    &opt.adjust_extension,  cmd_boolean }, /* deprecated */
   { "htmlify",          NULL,                   cmd_spec_htmlify },
   { "httpkeepalive",    &opt.http_keep_alive,   cmd_boolean },
   { "httppasswd",       &opt.http_passwd,       cmd_string }, /* deprecated */

diff --git a/src/main.c b/src/main.c
index d45465e72b3ac73582dd411c8e39730368354734..7040738a79888d4f218bf57bb2015f6972f2f4ae 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -197,7 +197,7 @@ static struct cmdline_option option_data[] =
     { "header", 0, OPT_VALUE, "header", -1 },
     { "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },
     { "host-directories", 0, OPT_BOOLEAN, "addhostdir", -1 },
-    { "html-extension", 'E', OPT_BOOLEAN, "adjustextension", -1 },
+    { "html-extension", 'E', OPT_BOOLEAN, "adjustextension", -1 }, /* deprecated */
     { "htmlify", 0, OPT_BOOLEAN, "htmlify", -1 },
     { "http-keep-alive", 0, OPT_BOOLEAN, "httpkeepalive", -1 },
     { "http-passwd", 0, OPT_VALUE, "httppassword", -1 }, /* deprecated */
@@ -232,7 +232,7 @@ static struct cmdline_option option_data[] =
     { "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 },
+    { "preserve-permissions", 0, OPT_BOOLEAN, "preservepermissions", -1 }, /* deprecated */
     { IF_SSL ("private-key"), 0, OPT_VALUE, "privatekey", -1 },
     { IF_SSL ("private-key-type"), 0, OPT_VALUE, "privatekeytype", -1 },
     { "progress", 0, OPT_VALUE, "progress", -1 },