From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 849F11F4B4; Sat, 17 Apr 2021 19:00:01 +0000 (UTC) Date: Sat, 17 Apr 2021 19:00:01 +0000 From: Eric Wong To: Kyle Meyer Cc: meta@public-inbox.org Subject: [PATCH] lei q: fix MUA spawn after reading query from stdin Message-ID: <20210417190001.GA8903@dcvr> References: <87v98klxg3.fsf@kyleam.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <87v98klxg3.fsf@kyleam.com> List-Id: Kyle Meyer wrote: > I'm not a mutt user, but I think that's because mutt sees that stdin > isn't attached to a tty. I haven't tried anything on my end yet, but > perhaps there's a clean way to make --stdin and --mua [*] work together. Thanks for the report. Yes, that's correct, fortunately we can reasonably expect stdout to be a terminal and the patch below should fix it. > [*] The only other --mua value I checked was 'mail' (and that shows a > similar issue), but I'm guessing other MUAs don't not work well > with --stdin either. Btw, since you seem to be a gnus user; does/can gnus work via --mua= ? ----------8<--------- Subject: [PATCH] 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 Link: https://public-inbox.org/meta/87v98klxg3.fsf@kyleam.com/ --- lib/PublicInbox/LEI.pm | 10 ++++++++-- script/lei | 12 ++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index ebd0f154..f223b3de 100644 --- 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 76217ab9..56e9d299 100755 --- 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 } };