our %CMD = ( # sorted in order of importance/use:
'q' => [ 'SEARCH_TERMS...', 'search for messages matching terms', qw(
save-as=s output|mfolder|o=s format|f=s dedupe|d=s thread|t augment|a
- sort|s=s reverse|r offset=i remote local! external! pretty
+ sort|s=s reverse|r offset=i remote local! external! pretty mua-cmd=s
since|after=s until|before=s), opt_dash('limit|n=i', '[0-9]+') ],
'show' => [ 'MID|OID', 'show a given object (Message-ID or object ID)',
'output|o=s' => [ 'DEST',
"destination (e.g. `/path/to/Maildir', or `-' for stdout)" ],
+'mua-cmd|mua=s' => [ 'COMMAND',
+ "MUA to run on --output Maildir or mbox (e.g. `mutt -f %f'" ],
'show format|f=s' => [ 'OUT|plain|raw|html|mboxrd|mboxcl2|mboxcl',
'message/object output format' ],
sub out ($;@) { print { shift->{1} } @_ }
sub err ($;@) {
- print { shift->{2} } @_, (substr($_[-1], -1, 1) eq "\n" ? () : "\n");
+ my $self = shift;
+ my $err = $self->{2} // *STDERR{IO};
+ print $err @_, (substr($_[-1], -1, 1) eq "\n" ? () : "\n");
}
sub qerr ($;@) { $_[0]->{opt}->{quiet} or err(shift, @_) }
sub atfork_prepare_wq {
my ($self, $wq) = @_;
- push @{$wq->{-ipc_atfork_child_close}}, @TO_CLOSE_ATFORK_CHILD,
- grep { defined } @$self{qw(0 1 2 sock)}
+ my $tcafc = $wq->{-ipc_atfork_child_close};
+ push @$tcafc, @TO_CLOSE_ATFORK_CHILD;
+ if (my $sock = $self->{sock}) {
+ push @$tcafc, @$self{qw(0 1 2)}, $sock;
+ }
+ for my $f (qw(lxs l2m)) {
+ my $ipc = $self->{$f} or next;
+ push @$tcafc, grep { defined }
+ @$ipc{qw(-wq_s1 -wq_s2 -ipc_req -ipc_res)};
+ }
}
# usage: my %sig = $lei->atfork_child_wq($wq);
# local @SIG{keys %sig} = values %sig;
sub atfork_child_wq {
my ($self, $wq) = @_;
- @$self{qw(0 1 2 sock)} = delete(@$wq{0..3});
+ my ($sock, $l2m_wq_s1);
+ (@$self{qw(0 1 2)}, $sock, $l2m_wq_s1) = delete(@$wq{0..4});
+ $self->{sock} = $sock if -S $sock;
+ $self->{l2m}->{-wq_s1} = $l2m_wq_s1 if $l2m_wq_s1 && -S $l2m_wq_s1;
%PATH2CFG = ();
$quit = \&CORE::exit;
@TO_CLOSE_ATFORK_CHILD = ();
PIPE => sub {
$self->x_it(13); # SIGPIPE = 13
# we need to close explicitly to avoid Perl warning on SIGPIPE
- close($_) for (delete @$self{1..2});
+ close(delete $self->{1});
+ # regular files and /dev/null (-c) won't trigger SIGPIPE
+ close(delete $self->{2}) unless (-f $self->{2} || -c _);
+ syswrite($self->{0}, '!') unless $self->{sock}; # for eof_wait
die bless(\"$_[0]", 'PublicInbox::SIGPIPE'),
});
}
# usage: ($lei, @io) = $lei->atfork_parent_wq($wq);
sub atfork_parent_wq {
my ($self, $wq) = @_;
- if ($wq->wq_workers) {
- my $env = delete $self->{env}; # env is inherited at fork
- my $ret = bless { %$self }, ref($self);
- $self->{env} = $env;
- delete @$ret{qw(-lei_store cfg pgr)};
- ($ret, delete @$ret{0..2}, delete($ret->{sock}) // ());
- } else {
- ($self, @$self{0..2}, $self->{sock} // ());
+ my $env = delete $self->{env}; # env is inherited at fork
+ my $ret = bless { %$self }, ref($self);
+ if (my $dedupe = delete $ret->{dedupe}) {
+ $ret->{dedupe} = $wq->deep_clone($dedupe);
}
+ $self->{env} = $env;
+ delete @$ret{qw(-lei_store cfg pgr lxs)}; # keep l2m
+ my @io = delete @$ret{0..2};
+ $io[3] = delete($ret->{sock}) // *STDERR{GLOB};
+ my $l2m = $ret->{l2m};
+ if ($l2m && $l2m != $wq) {
+ $io[4] = $l2m->{-wq_s1} if $l2m->{-wq_s1};
+ if (my @pids = $l2m->wq_close) {
+ $wq->{l2m_pids} = \@pids;
+ }
+ }
+ ($ret, @io);
}
sub _help ($;$) {
dwaitpid($pid, \&reap_exec, $self);
}
+sub exec_buf ($$) {
+ my ($argv, $env) = @_;
+ my $argc = scalar @$argv;
+ my $buf = 'exec '.join("\0", scalar(@$argv), @$argv);
+ while (my ($k, $v) = each %$env) { $buf .= "\0$k=$v" };
+ $buf;
+}
+
+sub start_mua {
+ my ($self, $sock) = @_;
+ my $mua = $self->{opt}->{'mua-cmd'} // return;
+ my $mfolder = $self->{ovv}->{dst};
+ require Text::ParseWords;
+ my $replaced;
+ my @cmd = Text::ParseWords::shellwords($mua);
+ # mutt uses '%f' for open-hook with compressed folders, so we use %f
+ @cmd = map { $_ eq '%f' ? ($replaced = $mfolder) : $_ } @cmd;
+ push @cmd, $mfolder unless defined($replaced);
+ $sock //= $self->{sock};
+ if ($PublicInbox::DS::in_loop) { # lei(1) client process runs it
+ send($sock, exec_buf(\@cmd, {}), MSG_EOR);
+ } else { # oneshot
+ $self->{"mua.pid.$self.$$"} = spawn(\@cmd);
+ }
+}
+
# caller needs to "-t $self->{1}" to check if tty
sub start_pager {
my ($self) = @_;
close($fh) or warn "`git var PAGER' error: \$?=$?";
return if $pager eq 'cat' || $pager eq '';
# TODO TIOCGWINSZ
- my %new_env = (LESS => 'FRX', LV => '-c', COLUMNS => 80);
- $new_env{MORE} = 'FRX' if $^O eq 'freebsd';
+ my $new_env = { LESS => 'FRX', LV => '-c', COLUMNS => 80 };
+ $new_env->{MORE} = 'FRX' if $^O eq 'freebsd';
pipe(my ($r, $wpager)) or return warn "pipe: $!";
my $rdr = { 0 => $r, 1 => $self->{1}, 2 => $self->{2} };
- my $pgr = [ undef, @$rdr{1, 2} ];
+ my $pgr = [ undef, @$rdr{1, 2}, $$ ];
if (my $sock = $self->{sock}) { # lei(1) process runs it
- delete @new_env{keys %$env}; # only set iff unset
- my $buf = "exec 1\0".$pager;
- while (my ($k, $v) = each %new_env) { $buf .= "\0$k=$v" };
+ delete @$new_env{keys %$env}; # only set iff unset
my $fds = [ map { fileno($_) } @$rdr{0..2} ];
- $send_cmd->($sock, $fds, $buf, MSG_EOR);
+ $send_cmd->($sock, $fds, exec_buf([$pager], $new_env), MSG_EOR);
} else {
- $pgr->[0] = spawn([$pager], $env, $rdr);
+ $pgr->[0] = spawn([$pager], $new_env, $rdr);
}
$self->{1} = $wpager;
$self->{2} = $wpager if -t $self->{2};
# do not restore original stdout, just close it so we error out
close(delete($self->{1})) if $self->{1};
my $pid = $pgr->[0];
- dwaitpid($pid, undef, $self->{sock}) if $pid;
+ dwaitpid($pid, undef, $self->{sock}) if $pid && $pgr->[3] == $$;
}
sub accept_dispatch { # Listener {post_accept} callback
my ($sock) = @_; # ignore other
$sock->autoflush(1);
my $self = bless { sock => $sock }, __PACKAGE__;
- vec(my $rvec, fileno($sock), 1) = 1;
+ vec(my $rvec = '', fileno($sock), 1) = 1;
select($rvec, undef, undef, 1) or
return send($sock, 'timed out waiting to recv FDs', MSG_EOR);
my @fds = $recv_cmd->($sock, my $buf, 4096 * 33); # >MAX_ARG_STRLEN
sub dclose {
my ($self) = @_;
delete $self->{lxs}; # stops LeiXSearch queries
- $self->close; # PublicInbox::DS::close
+ $self->close if $self->{sock}; # PublicInbox::DS::close
}
# for long-running results
sub event_step_init {
my ($self) = @_;
- $self->{sock}->blocking(0);
- $self->SUPER::new($self->{sock}, EPOLLIN|EPOLLET);
+ if (my $sock = $self->{sock}) { # using DS->EventLoop
+ $sock->blocking(0);
+ $self->SUPER::new($sock, EPOLLIN|EPOLLET);
+ }
}
sub noop {}
my ($self) = @_;
$self->{1}->autoflush(1) if $self->{1};
stop_pager($self);
+ if (my $mua_pid = delete $self->{"mua.pid.$self.$$"}) {
+ waitpid($mua_pid, 0);
+ }
}
1;