summaryrefslogtreecommitdiff
path: root/support/rrsync
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2009-01-07 16:38:06 -0800
committerWayne Davison <wayned@samba.org>2009-01-07 16:38:06 -0800
commitfc4a695cddfc1b7705f1e1e3ea13108777b3a76a (patch)
treec7ff0003fd7047845e581ed37b436e1a47a9393d /support/rrsync
parent83238ed0bbb8ee7202ca273ecc00765ee045717b (diff)
downloadrsync-fc4a695cddfc1b7705f1e1e3ea13108777b3a76a.tar.gz
Tweaked s### and m## to avoid vim highlighting issues.
Diffstat (limited to 'support/rrsync')
-rw-r--r--support/rrsync14
1 files changed, 7 insertions, 7 deletions
diff --git a/support/rrsync b/support/rrsync
index 26826319..65999750 100644
--- a/support/rrsync
+++ b/support/rrsync
@@ -174,10 +174,10 @@ while ($command =~ /((?:[^\s\\]+|\\.[^\s\\]*)+)/g) {
} 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));
}
@@ -204,10 +204,10 @@ sub check_arg
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"
- if $arg =~ m#(^|/)\.\.(/|$)#;
- $arg =~ s#^/#$subdir/#;
+ if $arg =~ m{(^|/)\.\.(/|$)};
+ $arg =~ s{^/}{$subdir/};
}
$arg;
}