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
Get rid of some trailing whitespace.
[rsync/rsync.git]
/
support
/
rrsync
diff --git
a/support/rrsync
b/support/rrsync
index
2682631
..
e3c5d41
100644
(file)
--- a/
support/rrsync
+++ b/
support/rrsync
@@
-74,15
+74,18
@@
our %long_opt = (
'delete-delay' => 0,
'delete-during' => 0,
'delete-excluded' => 0,
'delete-delay' => 0,
'delete-during' => 0,
'delete-excluded' => 0,
+ 'delete-missing-args' => 0,
'existing' => 0,
'fake-super' => 0,
'files-from' => 3,
'force' => 0,
'from0' => 0,
'fuzzy' => 0,
'existing' => 0,
'fake-super' => 0,
'files-from' => 3,
'force' => 0,
'from0' => 0,
'fuzzy' => 0,
+ 'groupmap' => 1,
'iconv' => 1,
'ignore-errors' => 0,
'ignore-existing' => 0,
'iconv' => 1,
'ignore-errors' => 0,
'ignore-existing' => 0,
+ 'ignore-missing-args' => 0,
'inplace' => 0,
'link-dest' => 2,
'list-only' => 0,
'inplace' => 0,
'link-dest' => 2,
'list-only' => 0,
@@
-92,7
+95,6
@@
our %long_opt = (
'max-size' => 1,
'min-size' => 1,
'modify-window' => 1,
'max-size' => 1,
'min-size' => 1,
'modify-window' => 1,
- 'no-i-r' => 0,
'no-implied-dirs' => 0,
'no-r' => 0,
'no-relative' => 0,
'no-implied-dirs' => 0,
'no-r' => 0,
'no-relative' => 0,
@@
-109,11
+111,13
@@
our %long_opt = (
'size-only' => 0,
'skip-compress' => 1,
'specials' => 0,
'size-only' => 0,
'skip-compress' => 1,
'specials' => 0,
+ 'stats' => 0,
'suffix' => 1,
'super' => 0,
'temp-dir' => 2,
'timeout' => 1,
'use-qsort' => 0,
'suffix' => 1,
'super' => 0,
'temp-dir' => 2,
'timeout' => 1,
'use-qsort' => 0,
+ 'usermap' => 1,
);
### END of options data produced by the cull_options script. ###
);
### END of options data produced by the cull_options script. ###
@@
-143,7
+147,8
@@
while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
if ($_ eq '.') {
$in_options = 0;
} else {
if ($_ eq '.') {
$in_options = 0;
} else {
- next if /^-$short_no_arg+(e\d*\.\w*)?$/o || /^-$short_with_num\d+$/o;
+ die "$0: invalid option: '-'\n" if $_ eq '-';
+ next if /^-$short_no_arg*(e\d*\.\w*)?$/o || /^-$short_with_num\d+$/o;
my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
my $disabled;
my($opt,$arg) = /^--([^=]+)(?:=(.*))?$/;
my $disabled;
@@
-174,10
+179,10
@@
while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
} else {
if ($subdir ne '/') {
# Validate args to ensure they don't try to leave our restricted dir.
} else {
if ($subdir ne '/') {
# Validate args to ensure they don't try to leave our restricted dir.
- s
#//+#/#
g;
- s
#^/##
;
- s
#^$#.#
;
- die "
Do not use .. in any path!\n" if m#(^|/)\\?\.\\?\.(\\?/|$)#
;
+ s
{//+}{/}
g;
+ s
{^/}{}
;
+ s
{^$}{.}
;
+ die "
$0: do not use .. in any path!\n" if m{(^|/)\\?\.\\?\.(\\?/|$)}
;
}
push(@args, bsd_glob($_, GLOB_LIMIT|GLOB_NOCHECK|GLOB_BRACE|GLOB_QUOTE));
}
}
push(@args, bsd_glob($_, GLOB_LIMIT|GLOB_NOCHECK|GLOB_BRACE|GLOB_QUOTE));
}
@@
-204,10
+209,10
@@
sub check_arg
my($opt, $arg, $type) = @_;
$arg =~ s/\\(.)/$1/g;
if ($subdir ne '/' && ($type == 3 || ($type == 2 && !$am_sender))) {
my($opt, $arg, $type) = @_;
$arg =~ s/\\(.)/$1/g;
if ($subdir ne '/' && ($type == 3 || ($type == 2 && !$am_sender))) {
- $arg =~ s
#//#/#
g;
+ $arg =~ s
{//}{/}
g;
die "Do not use .. in --$opt; anchor the path at the root of your restricted dir.\n"
die "Do not use .. in --$opt; anchor the path at the root of your restricted dir.\n"
- if $arg =~ m
#(^|/)\.\.(/|$)#
;
- $arg =~ s
#^/#$subdir/#
;
+ if $arg =~ m
{(^|/)\.\.(/|$)}
;
+ $arg =~ s
{^/}{$subdir/}
;
}
$arg;
}
}
$arg;
}