lei q: fix MUA spawn after reading query from stdin

Since "lei q" may read queries from stdin, we must reconnect a
known terminal before spawning terminal MUAs.  Attempt to use
stdout as stdin for this purpose, since terminal MUAs tend to
expect stdout to be a terminal.

Reported-By: Kyle Meyer <kyle@kyleam.com>
Link: https://public-inbox.org/meta/87v98klxg3.fsf@kyleam.com/

diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm
index ebd0f1545cc606321e3173ef41a8bfb130b4db95..f223b3deb41386a9676b44a607fcbe30b93d5094 100644 (file)
--- a/lib/PublicInbox/LEI.pm
+++ b/lib/PublicInbox/LEI.pm
@@ -840,11 +840,17 @@ sub start_mua {
                @cmd = map { $_ eq '%f' ? ($replaced = $mfolder) : $_ } @cmd;
        }
        push @cmd, $mfolder unless defined($replaced);
-       if (my $sock = $self->{sock}) { # lei(1) client process runs it
-               send($sock, exec_buf(\@cmd, {}), MSG_EOR);
+       if ($self->{sock}) { # lei(1) client process runs it
+               # restore terminal: echo $query | lei q -stdin --mua=...
+               my $io = [];
+               $io->[0] = $self->{1} if $self->{opt}->{stdin} && -t $self->{1};
+               send_exec_cmd($self, $io, \@cmd, {});
        } elsif ($self->{oneshot}) {
                my $pid = fork // die "fork: $!";
                if ($pid > 0) { # original process
+                       if ($self->{opt}->{stdin} && -t STDOUT) {
+                               open STDIN, '+<&', \*STDOUT or die "dup2: $!";
+                       }
                        exec(@cmd);
                        warn "exec @cmd: $!\n";
                        POSIX::_exit(1);

diff --git a/script/lei b/script/lei
index 76217ab9ba575e4e580aba0a789a67f634619dce..56e9d299593b95c907aaf2a8482ce862a91d5aba 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -33,6 +33,9 @@ my $exec_cmd = sub {
                push @rdr, shift(@old), $newfh;
        }
        my $do_exec = sub {
+               while (my ($io, $newfh) = splice(@rdr, 0, 2)) {
+                       open $io, '+<&', $newfh or die "open +<&=: $!";
+               }
                my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
                @ENV{keys %env} = values %env;
                exec(@argv);
@@ -42,20 +45,17 @@ my $exec_cmd = sub {
        $SIG{CHLD} = $sigchld;
        my $pid = fork // die "fork: $!";
        if ($pid == 0) {
-               while (my ($io, $newfh) = splice(@rdr, 0, 2)) {
-                       open $io, '+<&', $newfh or die "open +<&=: $!";
-               }
-               $do_exec->() if scalar(@$fds); # git-credential, pager
+               $do_exec->() if $fds->[1]; # git-credential, pager
 
                # parent backgrounds on MUA
                POSIX::setsid() > 0 or die "setsid: $!";
                @parent = ($parent);
                return; # continue $recv_cmd in background
        }
-       if (scalar(@$fds)) {
+       if ($fds->[1]) {
                $pids{$pid} = undef;
        } else {
-               $do_exec->(); # MUA reuses all FDs
+               $do_exec->(); # MUA reuses stdout
        }
 };