From: Wayne Davison <wayned@samba.org>
Date: Thu, 8 Jan 2009 00:38:06 +0000 (-0800)
Subject: Tweaked s### and m## to avoid vim highlighting issues.
X-Git-Tag: v3.1.0pre1~439
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fc4a695cddfc1b7705f1e1e3ea13108777b3a76a;p=thirdparty%2Frsync.git

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

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;
 }