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
Write out the right compat_flags value into the batch file.
[rsync/rsync.git]
/
support
/
rrsync
diff --git
a/support/rrsync
b/support/rrsync
index
2682631
..
0369bc6
100644
(file)
--- a/
support/rrsync
+++ b/
support/rrsync
@@
-143,7
+143,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
+175,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
+205,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;
}