delete($pids{$pid}) if waitpid($pid, $flags) == $pid;
}
};
-
+my @parent;
my $exec_cmd = sub {
my ($fds, $argc, @argv) = @_;
+ my $parent = $$;
+ require POSIX;
my @old = (*STDIN{IO}, *STDOUT{IO}, *STDERR{IO});
my @rdr;
for my $fd (@$fds) {
- open(my $tmpfh, '+<&=', $fd) or die "open +<&=$fd: $!";
- push @rdr, shift(@old), $tmpfh;
+ open(my $newfh, '+<&=', $fd) or die "open +<&=$fd: $!";
+ push @rdr, shift(@old), $newfh;
}
- require POSIX; # WNOHANG
- $SIG{CHLD} = $sigchld;
- my $pid = fork // die "fork: $!";
- if ($pid == 0) {
- my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
- while (my ($old_io, $tmpfh) = splice(@rdr, 0, 2)) {
- open $old_io, '+<&', $tmpfh or die "open +<&=: $!";
+ my $do_exec = sub {
+ my @non_std; # ex. $op_p from lei_edit_search
+ while (my ($io, $newfh) = splice(@rdr, 0, 2)) {
+ my $old_io = !!$io;
+ open $io, '+<&', $newfh or die "open +<&=: $!";
+ push @non_std, $io unless $old_io;
+ }
+ if (@non_std) {
+ require Fcntl;
+ fcntl($_, Fcntl::F_SETFD(), 0) for @non_std;
}
- %ENV = (%ENV, %env);
+ my %env = map { split(/=/, $_, 2) } splice(@argv, $argc);
+ @ENV{keys %env} = values %env;
exec(@argv);
warn "exec: @argv: $!\n";
POSIX::_exit(1);
+ };
+ $SIG{CHLD} = $sigchld;
+ my $pid = fork // die "fork: $!";
+ if ($pid == 0) {
+ $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 ($fds->[1]) {
+ $pids{$pid} = undef;
+ } else {
+ $do_exec->(); # MUA reuses stdout
}
- $pids{$pid} = 1;
};
if ($send_cmd && eval {
my $path = do {
my $runtime_dir = ($ENV{XDG_RUNTIME_DIR} // '') . '/lei';
+ die \0 if $runtime_dir eq '/dev/null/lei'; # oneshot forced
if ($runtime_dir eq '/lei') {
require File::Spec;
$runtime_dir = File::Spec->tmpdir."/lei-$<";
while (my ($k, $v) = each %ENV) { $buf .= "\0$k=$v" }
$buf .= "\0\0";
my $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)], $buf, MSG_EOR);
- if (!$n && $!{ETOOMANYREFS} && eval { require BSD::Resource }) {
- my $NOFILE = BSD::Resource::RLIMIT_NOFILE();
- my ($s, $h) = BSD::Resource::getrlimit($NOFILE);
- if ($s < $h && BSD::Resource::setrlimit($NOFILE, $h, $h)) {
- $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)],
- $buf, MSG_EOR);
- }
- }
if (!$n) {
die "sendmsg: $! (check RLIMIT_NOFILE)\n" if $!{ETOOMANYREFS};
die "sendmsg: $!\n";
if ($buf =~ /\Aexec (.+)\z/) {
$exec_cmd->(\@fds, split(/\0/, $1));
} elsif ($buf eq '-WINCH') {
- kill($buf, $$); # for MUA
+ kill($buf, @parent); # for MUA
} elsif ($buf =~ /\Ax_it ([0-9]+)\z/) {
- $x_it_code = $1 + 0;
+ $x_it_code ||= $1 + 0;
last;
} elsif ($buf =~ /\Achild_error ([0-9]+)\z/) {
- $x_it_code = $1 + 0;
+ $x_it_code ||= $1 + 0;
} else {
$sigchld->();
die $buf;
}
exit($x_it_code >> 8);
} else { # for systems lacking Socket::MsgHdr or Inline::C
- warn $@ if $@;
+ warn $@ if $@ && !ref($@);
require PublicInbox::LEI;
PublicInbox::LEI::oneshot(__PACKAGE__);
}