[svn] Added the --ftp-passwd command line option.

diff --git a/src/ChangeLog b/src/ChangeLog
index 403213659454aba1c0d1887db5b30226569e59d7..57146d70593a096018b690a3a5da8e1921ecc5d4 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-18  Mauro Tortonesi <mauro@ferrara.linux.it>
+
+       * main.c: Added the --ftp-passwd command line option.
+
+       * init.c: Renamed command passwd to ftppasswd.
+
 2005-02-11  Mauro Tortonesi <mauro@ferrara.linux.it>
        
        * string_t.c: Fixed a bug in do_escape and triggered escape of

diff --git a/src/init.c b/src/init.c
index 1096de026f9297bbd3d2a361868b860f74da56e7..1aaa13e9212d9c2816238cb0bf3d78729e6b582d 100644 (file)
--- a/src/init.c
+++ b/src/init.c
@@ -143,6 +143,7 @@ static struct {
   { "followftp",       &opt.follow_ftp,        cmd_boolean },
   { "followtags",      &opt.follow_tags,       cmd_vector },
   { "forcehtml",       &opt.force_html,        cmd_boolean },
+  { "ftppasswd",       &opt.ftp_pass,          cmd_string },
   { "ftpproxy",                &opt.ftp_proxy,         cmd_string },
   { "glob",            &opt.ftp_glob,          cmd_boolean },
   { "header",          &opt.user_headers,      cmd_spec_header },
@@ -176,7 +177,6 @@ static struct {
   { "outputdocument",  &opt.output_document,   cmd_file },
   { "pagerequisites",  &opt.page_requisites,   cmd_boolean },
   { "passiveftp",      &opt.ftp_pasv,          cmd_lockable_boolean },
-  { "passwd",          &opt.ftp_pass,          cmd_string },
   { "postdata",                &opt.post_data,         cmd_string },
   { "postfile",                &opt.post_file_name,    cmd_file },
   { "preservepermissions", &opt.preserve_perm, cmd_boolean },

diff --git a/src/main.c b/src/main.c
index 2facb8bd3567fb6da12bf2b3e2cf0fd3f7e0e4ef..f9827dd8b58a03b03d171cda32cfdeb5e0f7bcae 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -182,6 +182,7 @@ struct cmdline_option option_data[] =
     { "follow-tags", 0, OPT_VALUE, "followtags", -1 },
     { "force-directories", 'x', OPT_BOOLEAN, "dirstruct", -1 },
     { "force-html", 'F', OPT_BOOLEAN, "forcehtml", -1 },
+    { "ftp-passwd", 0, OPT_VALUE, "ftppasswd", -1 },
     { "glob", 0, OPT_BOOLEAN, "glob", -1 },
     { "header", 0, OPT_VALUE, "header", -1 },
     { "help", 'h', OPT_FUNCALL, (void *)print_help, no_argument },