lei: attempt to canonicalize away "/../" pathnames

[public-inbox.git] / lib / PublicInbox / LeiQuery.pm

diff --git a/lib/PublicInbox/LeiQuery.pm b/lib/PublicInbox/LeiQuery.pm
index 1999a5344885f22799b666459579d04d88aa9831..37b660f9ce1ca46a31e5c9ed4a7230be16398f35 100644 (file)
--- a/lib/PublicInbox/LeiQuery.pm
+++ b/lib/PublicInbox/LeiQuery.pm
@@ -1,7 +1,8 @@
 # Copyright (C) 2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
-# handles lei <q|ls-query|rm-query|mv-query> commands
+# handles "lei q" command and provides internals for
+# several other sub-commands (up, lcat, ...)
 package PublicInbox::LeiQuery;
 use strict;
 use v5.10.1;
@@ -51,9 +52,7 @@ sub qstr_add { # PublicInbox::InputPipe::consume callback for --stdin
        my ($self) = @_; # $_[1] = $rbuf
        if (defined($_[1])) {
                $_[1] eq '' and return eval {
-                       if (my $dfd = $self->{3}) {
-                               chdir($dfd) or return $self->fail("fchdir: $!");
-                       }
+                       $self->fchdir or return;
                        $self->{mset_opt}->{q_raw} = $self->{mset_opt}->{qstr};
                        $self->{lse}->query_approxidate($self->{lse}->git,
                                                $self->{mset_opt}->{qstr});
@@ -117,7 +116,7 @@ sub lei_q {
        my ($self, @argv) = @_;
        PublicInbox::Config->json; # preload before forking
        my $lxs = lxs_prepare($self) or return;
-       $self->ale->refresh_externals($lxs);
+       $self->ale->refresh_externals($lxs, $self);
        my $opt = $self->{opt};
        my %mset_opt = map { $_ => $opt->{$_} } qw(threads limit offset);
        $mset_opt{asc} = $opt->{'reverse'} ? 1 : 0;
@@ -132,6 +131,8 @@ sub lei_q {
                } else {
                        die "unrecognized --sort=$sort\n";
                }
+               $opt->{save} and return
+                       $self->fail('--save and --sort are incompatible');
        }
        $self->{mset_opt} = \%mset_opt;