summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsupport/cull_options2
-rw-r--r--support/rrsync4
2 files changed, 2 insertions, 4 deletions
diff --git a/support/cull_options b/support/cull_options
index ab16238c..c85a0363 100755
--- a/support/cull_options
+++ b/support/cull_options
@@ -33,8 +33,6 @@ while (<IN>) {
}
close IN;
-$short_no_arg{'s'} = 1;
-
my $short_no_arg = join('', sort keys %short_no_arg);
my $short_with_num = join('', sort keys %short_with_num);
diff --git a/support/rrsync b/support/rrsync
index 6a2e5b0b..e1ae6ec8 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -50,7 +50,7 @@ die "$0 -ro: sending to read-only server not allowed\n" if $ro && !$am_sender;
# To disable a short-named option, add its letter to this string:
our $short_disabled = 's';
-our $short_no_arg = 'ACDEHIKLORSWXbcdgklmnoprtuvxz'; # DO NOT REMOVE ANY
+our $short_no_arg = 'ACDEHIKLORSWXbcdgklmnoprstuvxz'; # DO NOT REMOVE ANY
our $short_with_num = 'B'; # DO NOT REMOVE ANY
# To disable a long-named option, change its value to a -1. The values mean:
@@ -139,7 +139,7 @@ while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
if ($_ eq '.') {
$in_options = 0;
} else {
- next if /^-$short_no_arg+$/o || /^-$short_with_num\d+$/o;
+ next if /^-$short_no_arg+(e\d+\.\d+)?$/o || /^-$short_with_num\d+$/o;
my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
my $disabled;