lei: increase initial timeout

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index a4a0217bfa3237ca0f684a012bcbf98740abd7e1..f92dd302525fca9eb41b93ee580264c588e659c6 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -23,20 +23,19 @@ sub sigchld {
 
 sub exec_cmd {
        my ($fds, $argc, @argv) = @_;
-       my @m = (*STDIN{IO}, '<&=',  *STDOUT{IO}, '>&=', *STDERR{IO}, '>&=');
+       my @old = (*STDIN{IO}, *STDOUT{IO}, *STDERR{IO});
        my @rdr;
        for my $fd (@$fds) {
-               my ($old_io, $mode) = splice(@m, 0, 2);
-               open(my $tmpfh, $mode, $fd) or die "open $mode$fd: $!";
-               push @rdr, $old_io, $mode, $tmpfh;
+               open(my $tmpfh, '+<&=', $fd) or die "open +<&=$fd: $!";
+               push @rdr, shift(@old), $tmpfh;
        }
        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, $mode, $tmpfh) = splice(@rdr, 0, 3)) {
-                       open $old_io, $mode, $tmpfh or die "open $mode: $!";
+               while (my ($old_io, $tmpfh) = splice(@rdr, 0, 2)) {
+                       open $old_io, '+<&', $tmpfh or die "open +<&=: $!";
                }
                %ENV = (%ENV, %env);
                exec(@argv);
@@ -80,12 +79,8 @@ Falling back to (slow) one-shot mode
        my $buf = join("\0", scalar(@ARGV), @ARGV);
        while (my ($k, $v) = each %ENV) { $buf .= "\0$k=$v" }
        $buf .= "\0\0";
-       $send_cmd->($sock, [ 0, 1, 2, fileno($dh) ], $buf, MSG_EOR);
-       $SIG{TERM} = $SIG{INT} = $SIG{QUIT} = sub {
-               my ($sig) = @_; # 'TERM', not an integer :<
-               $SIG{$sig} = 'DEFAULT';
-               kill($sig, $$); # exit($signo + 128)
-       };
+       $send_cmd->($sock, [ 0, 1, 2, fileno($dh) ], $buf, MSG_EOR) or
+               die "sendmsg: $!";
        my $x_it_code = 0;
        while (1) {
                my (@fds) = $recv_cmd->($sock, $buf, 4096 * 33);
@@ -98,6 +93,8 @@ Falling back to (slow) one-shot mode
                if ($buf =~ /\Ax_it ([0-9]+)\z/) {
                        $x_it_code = $1 + 0;
                        last;
+               } elsif ($buf =~ /\Achild_error ([0-9]+)\z/) {
+                       $x_it_code = $1 + 0;
                } elsif ($buf =~ /\Aexec (.+)\z/) {
                        exec_cmd(\@fds, split(/\0/, $1));
                } else {