From fc4a695cddfc1b7705f1e1e3ea13108777b3a76a Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Wed, 7 Jan 2009 16:38:06 -0800 Subject: [PATCH] Tweaked s### and m## to avoid vim highlighting issues. --- support/rrsync | 14 +++++++------- 1 file 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; } -- 2.34.1