From: Eric Wong <e@80x24.org>
Date: Wed, 10 Feb 2021 08:38:39 +0000 (-0100)
Subject: lei_external: fix+test handling of escaped braces
X-Git-Tag: v1.7.0~1134
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=9eb840de546dfe9b6c6aa1588f5bb8c0153c7d71;p=public-inbox.git

lei_external: fix+test handling of escaped braces

While '{' and '}' are rare in path names, somebody may still
use them or deal with software which does (e.g. GNU arch).
---

diff --git a/lib/PublicInbox/LeiExternal.pm b/lib/PublicInbox/LeiExternal.pm
index 8a51afcb..6cc2e671 100644
--- a/lib/PublicInbox/LeiExternal.pm
+++ b/lib/PublicInbox/LeiExternal.pm
@@ -58,16 +58,17 @@ sub glob2re {
 		$re_map{$p eq '\\' ? '' : do {
 			if ($1 eq '[') { ++$in_bracket }
 			elsif ($1 eq ']') { --$in_bracket }
+			elsif ($1 eq ',') { ++$qm } # no change
 			$p = $1;
 		}} // do {
 			$p = $1;
 			($p eq '-' && $in_bracket) ? $p : (++$qm, "\Q$p")
 		}!sge);
 	# bashism (also supported by curl): {a,b,c} => (a|b|c)
-	$re =~ s/([^\\]*)\\\{([^,]*?,[^\\]*?)\\\}/
-		(my $in_braces = $2) =~ tr!,!|!;
-		$1."($in_braces)";
-		/sge;
+	$changes += ($re =~ s/([^\\]*)\\\{([^,]*,[^\\]*)\\\}/
+			(my $in_braces = $2) =~ tr!,!|!;
+			$1."($in_braces)";
+			/sge);
 	($changes - $qm) ? $re : undef;
 }
 
diff --git a/t/lei_external.t b/t/lei_external.t
index 0ef6633d..78f71658 100644
--- a/t/lei_external.t
+++ b/t/lei_external.t
@@ -28,5 +28,7 @@ is_deeply($glob2re->('{a'), undef, 'open left brace');
 is_deeply($glob2re->('a}'), undef, 'open right brace');
 is_deeply($glob2re->('*.[ch]'), '[^/]*?\\.[ch]', 'suffix glob');
 is_deeply($glob2re->('{[a-z],9,}'), '([a-z]|9|)' , 'brace with range');
+is_deeply($glob2re->('\\{a,b\\}'), undef, 'escaped brace');
+is_deeply($glob2re->('\\\\{a,b}'), '\\\\\\\\(a|b)', 'fake escape brace');
 
 done_testing;