From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/5] config: glob2re: fix over-matching /**/foo
Date: Tue, 16 Jan 2024 11:52:54 +0000 [thread overview]
Message-ID: <20240116115255.3554317-5-e@80x24.org> (raw)
In-Reply-To: <20240116115255.3554317-1-e@80x24.org>
Noticed while adding wildcard support to WwwCoderepo...
---
lib/PublicInbox/Config.pm | 2 +-
t/config.t | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm
index 33c59ec7..b8d3c485 100644
--- a/lib/PublicInbox/Config.pm
+++ b/lib/PublicInbox/Config.pm
@@ -662,7 +662,7 @@ sub squote_maybe ($) {
}
my %re_map = ( '*' => '[^/]*?', '?' => '[^/]',
- '/**' => '/.*', '**/' => '.*/', '/**/' => '/.*?',
+ '/**' => '/.*', '**/' => '.*/', '/**/' => '(?:/.*?/|/)',
'[' => '[', ']' => ']', ',' => ',' );
sub glob2re ($) {
diff --git a/t/config.t b/t/config.t
index 975cf836..c41a42d3 100644
--- a/t/config.t
+++ b/t/config.t
@@ -296,8 +296,9 @@ is_deeply($glob2re->('\\\\{a,b}'), '\\\\\\\\(a|b)', 'fake escape brace');
is_deeply($glob2re->('**/foo'), '.*/foo', 'double asterisk start');
is_deeply($glob2re->('foo/**'), 'foo/.*', 'double asterisk end');
my $re = $glob2re->('a/**/b');
-is_deeply($re, 'a/.*?b', 'double asterisk middle');
+is_deeply($re, 'a(?:/.*?/|/)b', 'double asterisk middle');
like($_, qr!$re!, "a/**/b matches $_") for ('a/b', 'a/c/b', 'a/c/a/b');
+unlike($_, qr!$re!, "a/**/b doesn't match $_") for ('a/ab');
{
my $w = '';
next prev parent reply other threads:[~2024-01-16 11:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-16 11:52 [PATCH 0/5] www: coderepo updates Eric Wong
2024-01-16 11:52 ` [PATCH 1/5] tests: clarify Email::MIME is only for development Eric Wong
2024-01-16 11:52 ` [PATCH 2/5] examples/unsubscribe-milter@.service: use KillMode=process Eric Wong
2024-01-16 11:52 ` [PATCH 3/5] config: don't vivify invalid fields for coderepos Eric Wong
2024-01-16 11:52 ` Eric Wong [this message]
2024-01-16 11:52 ` [PATCH 5/5] www: repolist: support globbing in URL Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240116115255.3554317-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).