Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed a hang when using --remove-source-files in dry-run mode.
[rsync/rsync.git]
/
support
/
rrsync
diff --git
a/support/rrsync
b/support/rrsync
index
6a2e5b0
..
6e1a6eb
100644
(file)
--- 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';
# 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 = 'ACDEHIKLORSWXbcdgklmnopr
s
tuvxz'; # 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:
our $short_with_num = 'B'; # DO NOT REMOVE ANY
# To disable a long-named option, change its value to a -1. The values mean:
@@
-74,6
+74,7
@@
our %long_opt = (
'delete-during' => 0,
'delete-excluded' => 0,
'existing' => 0,
'delete-during' => 0,
'delete-excluded' => 0,
'existing' => 0,
+ 'fake-super' => 0,
'files-from' => 3,
'force' => 0,
'from0' => 0,
'files-from' => 3,
'force' => 0,
'from0' => 0,
@@
-84,6
+85,7
@@
our %long_opt = (
'inplace' => 0,
'link-dest' => 2,
'list-only' => 0,
'inplace' => 0,
'link-dest' => 2,
'list-only' => 0,
+ 'log-file' => 3,
'log-format' => 1,
'max-delete' => 1,
'max-size' => 1,
'log-format' => 1,
'max-delete' => 1,
'max-size' => 1,
@@
-110,6
+112,7
@@
our %long_opt = (
'super' => 0,
'temp-dir' => 2,
'timeout' => 1,
'super' => 0,
'temp-dir' => 2,
'timeout' => 1,
+ 'use-qsort' => 0,
);
### END of options data produced by the cull_options script. ###
);
### END of options data produced by the cull_options script. ###
@@
-139,7
+142,7
@@
while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
if ($_ eq '.') {
$in_options = 0;
} else {
if ($_ eq '.') {
$in_options = 0;
} else {
- next if /^-$short_no_arg+$/o || /^-$short_with_num\d+$/o;
+ next if /^-$short_no_arg+
(e\d*\.\w*)?
$/o || /^-$short_with_num\d+$/o;
my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
my $disabled;
my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
my $disabled;