1 files changed, 21 insertions, 25 deletions

diff --git a/lib/PublicInbox/SpawnPP.pm b/lib/PublicInbox/SpawnPP.pm
index 6d7e2c34..9ad4d0a1 100644
--- a/lib/PublicInbox/SpawnPP.pm
+++ b/lib/PublicInbox/SpawnPP.pm
@@ -1,27 +1,29 @@
-# Copyright (C) 2016-2021 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Pure-Perl implementation of "spawn".  This can't take advantage
 # of vfork, so no speedups under Linux for spawning from large processes.
+# Do not require this directly, only use from PublicInbox::Spawn
 package PublicInbox::SpawnPP;
-use strict;
-use v5.10.1;
+use v5.12;
 use POSIX qw(dup2 _exit setpgid :signal_h);
+use autodie qw(chdir close pipe);
+use PublicInbox::OnDestroy;
+# this is loaded by PublicInbox::Spawn, so we can't use/require it, here
 
 # Pure Perl implementation for folks that do not use Inline::C
 sub pi_fork_exec ($$$$$$$) {
         my ($redir, $f, $cmd, $env, $rlim, $cd, $pgid) = @_;
         my $old = POSIX::SigSet->new();
         my $set = POSIX::SigSet->new();
-        $set->fillset or die "fillset failed: $!";
-        sigprocmask(SIG_SETMASK, $set, $old) or die "can't block signals: $!";
-        my $syserr;
-        pipe(my ($r, $w));
-        my $pid = fork;
-        unless (defined $pid) { # compat with Inline::C version
-                $syserr = $!;
-                $pid = -1;
+        $set->fillset or die "sigfillset: $!";
+        for (POSIX::SIGABRT, POSIX::SIGBUS, POSIX::SIGFPE,
+                        POSIX::SIGILL, POSIX::SIGSEGV) {
+                $set->delset($_) or die "delset($_): $!";
         }
+        sigprocmask(SIG_SETMASK, $set, $old) or die "SIG_SETMASK(set): $!";
+        pipe(my $r, my $w);
+        my $pid = PublicInbox::OnDestroy::fork_tmp;
         if ($pid == 0) {
                 close $r;
                 $SIG{__DIE__} = sub {
@@ -38,36 +40,30 @@ sub pi_fork_exec ($$$$$$$) {
                 if ($pgid >= 0 && !defined(setpgid(0, $pgid))) {
                         die "setpgid(0, $pgid): $!";
                 }
-                for (keys %SIG) {
-                        $SIG{$_} = 'DEFAULT' if substr($_, 0, 1) ne '_';
-                }
-                if ($cd ne '') {
-                        chdir $cd or die "chdir $cd: $!";
-                }
+                $SIG{$_} = 'DEFAULT' for grep(!/\A__/, keys %SIG);
+                chdir($cd) if $cd ne '';
                 while (@$rlim) {
                         my ($r, $soft, $hard) = splice(@$rlim, 0, 3);
                         BSD::Resource::setrlimit($r, $soft, $hard) or
                                 die "setrlimit($r=[$soft,$hard]: $!)";
                 }
-                $old->delset(POSIX::SIGCHLD) or die "delset SIGCHLD: $!";
-                sigprocmask(SIG_SETMASK, $old) or die "SETMASK: ~SIGCHLD: $!";
+                $old->delset(POSIX::SIGCHLD) or die "sigdelset CHLD: $!";
+                sigprocmask(SIG_SETMASK, $old) or die "SIG_SETMASK ~CHLD: $!";
                 $cmd->[0] = $f;
                 if ($ENV{MOD_PERL}) {
-                        @$cmd = (which('env'), '-i', @$env, @$cmd);
+                        $f = PublicInbox::Spawn::which('env');
+                        @$cmd = ('env', '-i', @$env, @$cmd);
                 } else {
                         %ENV = map { split(/=/, $_, 2) } @$env;
                 }
-                undef $r;
                 exec { $f } @$cmd;
                 die "exec @$cmd failed: $!";
         }
         close $w;
-        sigprocmask(SIG_SETMASK, $old) or die "can't unblock signals: $!";
+        sigprocmask(SIG_SETMASK, $old) or die "SIG_SETMASK(old): $!";
         if (my $cerrnum = do { local $/, <$r> }) {
-                $pid = -1;
                 $! = $cerrnum;
-        } else {
-                $! = $syserr;
+                die "forked child $@: $!";
         }
         $pid;
 }