From 9c08efbbdb078f403feb1f9821fb13f12d868244 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 17 Apr 2021 19:00:53 +0000 Subject: lei up: further improve Maildir canonicalization We want to be able to use "lei up ." when inside a Maildir. We'll also relax Maildir/mbox basenames to be any non-'/' character after converting relative paths to absolute. The old restriction on allowed characters was unnecessary and made it impossible to reliably map "." when used as the sole argument for "lei up". --- lib/PublicInbox/LeiSavedSearch.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lib/PublicInbox') diff --git a/lib/PublicInbox/LeiSavedSearch.pm b/lib/PublicInbox/LeiSavedSearch.pm index 0f632d93..e44779ee 100644 --- a/lib/PublicInbox/LeiSavedSearch.pm +++ b/lib/PublicInbox/LeiSavedSearch.pm @@ -24,9 +24,10 @@ sub lss_dir_for ($$) { $$dstref = $$uri; @n = ($uri->mailbox); } else { # basename - @n = ($$dstref =~ m{([\w\-\.]+)/*\z}); $$dstref = $lei->rel2abs($$dstref); $$dstref .= '/' if -d $$dstref; + $$dstref =~ tr!/!/!s; + @n = ($$dstref =~ m{([^/]+)/*\z}); } push @n, sha256_hex($$dstref); $lei->share_path . '/saved-searches/' . join('-', @n); @@ -40,7 +41,8 @@ sub new { my $f; $dir = $dst; output2lssdir($self, $lei, \$dir, \$f) or - return $lei->fail("--save was not used with $dst"); + return $lei->fail("--save was not used with $dst cwd=". + $lei->rel2abs('.')); $self->{-cfg} //= PublicInbox::Config::git_config_dump($f); $self->{'-f'} = $f; } else { # new saved search "lei q --save" -- cgit v1.2.3-24-ge0c7