From e3acbd2aaf2c1a6556b20243781f4e4b83dbd2a2 Mon Sep 17 00:00:00 2001 From: hniksic Date: Mon, 25 Apr 2005 03:13:18 -0700 Subject: [PATCH] [svn] Restore old behavior of -Y. --- src/ChangeLog | 5 +++++ src/main.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 992558ad..2b41b878 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-04-25 Hrvoje Niksic + + * main.c (option_data): Don't treat -Y as a boolean switch; treat + it as a value switch instead, so "-Y off" continues to work. + 2005-04-24 Hrvoje Niksic * utils.c (aprintf): Delete unreachable statement. diff --git a/src/main.c b/src/main.c index 4d2163ab..c91846c9 100644 --- a/src/main.c +++ b/src/main.c @@ -218,7 +218,8 @@ struct cmdline_option option_data[] = { "preserve-permissions", 0, OPT_BOOLEAN, "preservepermissions", -1 }, { "progress", 0, OPT_VALUE, "progress", -1 }, { "protocol-directories", 0, OPT_BOOLEAN, "protocoldirectories", -1 }, - { "proxy", 'Y', OPT_BOOLEAN, "useproxy", -1 }, + { "proxy", 0, OPT_BOOLEAN, "useproxy", -1 }, + { "_proxy-compat", 'Y', OPT_VALUE, "useproxy", -1 }, /* back-compatible */ { "proxy-passwd", 0, OPT_VALUE, "proxypasswd", -1 }, { "proxy-user", 0, OPT_VALUE, "proxyuser", -1 }, { "quiet", 'q', OPT_BOOLEAN, "quiet", -1 },