From e9eac06d78a5242b7f661ab1681b8b5b9216dcf5 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 11 Jun 2023 16:26:49 +0100
Subject: [PATCH] mason/.perl-lib/TrivGal.pm: Settle on `#' as the emergency
 regex delimiter.

---
 mason/.perl-lib/TrivGal.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mason/.perl-lib/TrivGal.pm b/mason/.perl-lib/TrivGal.pm
index 8673b75..bbef2ed 100644
--- a/mason/.perl-lib/TrivGal.pm
+++ b/mason/.perl-lib/TrivGal.pm
@@ -56,10 +56,10 @@ sub join_paths (@) {
   my @p = @_;
   my $p = "";
   ELT: for my $e (@p) {
-    $e =~ s:^/{2,}:/:;
-    $e =~ s,([^/])/+$,$1,;
+    $e =~ s#^/{2,}#/#;
+    $e =~ s#([^/])/+$#$1#;
     if ($e eq "") { next ELT; }
-    elsif ($p eq "" || $e =~ m,^/,) { $p = $e; }
+    elsif ($p eq "" || $e =~ m#^/#) { $p = $e; }
     else { $p = "$p/$e"; }
   }
   return $p;
@@ -69,7 +69,7 @@ export qw{split_path};
 sub split_path ($) {
   my ($path) = @_;
 
-  my ($dir, $base, $ext) = $path =~ m,^(?:(.*)/)?(?:([^/]*)\.)?([^./]*)$,;
+  my ($dir, $base, $ext) = $path =~ m#^(?:(.*)/)?(?:([^/]*)\.)?([^./]*)$#;
   if (defined $base) { $ext = ".$ext"; }
   else { $base = $ext; $ext = ""; }
   return ($dir, $base, $ext);
@@ -78,14 +78,14 @@ sub split_path ($) {
 export qw{urlencode};
 sub urlencode ($) {
   my ($u) = @_;
-  $u =~ s:([^0-9a-zA-Z_./~-]):sprintf "%%%02x", ord $1:eg;
+  $u =~ s#([^0-9a-zA-Z_./~-])#sprintf "%%%02x", ord $1#eg;
   return $u;
 }
 
 export qw{urldecode};
 sub urldecode ($) {
   my ($u) = @_;
-  $u =~ s:\%([0-9a-fA-F]{2}):chr hex $1:eg;
+  $u =~ s#\%([0-9a-fA-F]{2})#chr hex $1#eg;
   return $u;
 }
 
@@ -297,7 +297,7 @@ sub listdir ($) {
 	my ($indexp, $name, $c) = /(!\s+)?(\S+)\s*(\S|\S.*\S)?\s*$/;
 	$name = urldecode $name;
 	my $list;
-	if ($name =~ m!/$!) {
+	if ($name =~ m#/$#) {
 	  $list = \@d;
 	  die "can't index a folder" if $indexp;
 	} else {
@@ -363,7 +363,7 @@ sub find_covering_file ($$$) {
   for (;;) {
     my $stuff = contents "$top/$path/$name"; return $stuff if defined $stuff;
     if ($path eq "") { return undef; }
-    if ($path =~ m!^(.*)/[^/]+/?!) { $path = $1; }
+    if ($path =~ m#^(.*)/[^/]+/?#) { $path = $1; }
     else { $path = ""; }
   }
 }
-- 
2.11.0