Skip to content

L
liblongpath-rsync
Commit fc4a695c authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

Tweaked s### and m## to avoid vim highlighting issues.

parent 83238ed0
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
support/rrsync
View file @ fc4a695c
...@@ -174,10 +174,10 @@ while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) { ...@@ -174,10 +174,10 @@ while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
} else { } else {
if ($subdir ne '/') { if ($subdir ne '/') {
# Validate args to ensure they don't try to leave our restricted dir. # Validate args to ensure they don't try to leave our restricted dir.
s#//+#/#g; s{//+}{/}g;
s#^/##; s{^/}{};
s#^$#.#; s{^$}{.};
die "Do not use .. in any path!\n" if m#(^|/)\\?\.\\?\.(\\?/|$)#; 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 +204,10 @@ sub check_arg ...@@ -204,10 +204,10 @@ sub check_arg
my($opt, $arg, $type) = @_; my($opt, $arg, $type) = @_;
$arg =~ s/\\(.)/$1/g; $arg =~ s/\\(.)/$1/g;
if ($subdir ne '/' && ($type == 3 || ($type == 2 && !$am_sender))) { 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#(^|/)\.\.(/|$)#; if $arg =~ m{(^|/)\.\.(/|$)};
$arg =~ s#^/#$subdir/#; $arg =~ s{^/}{$subdir/};
} }
$arg; $arg;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment