ipc: get rid of wq_set_recv_modes

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index 9610a876b489e7b55726ad5d0f1ea253edec67f0..006c118089397ff9e670e1de52b56c6e0a59f0ee 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -6,7 +6,7 @@ use v5.10.1;
 use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
 use Errno qw(EINTR ECONNRESET);
 use PublicInbox::CmdIPC4;
-my $narg = 4;
+my $narg = 5;
 my ($sock, $pwd);
 my $recv_cmd = PublicInbox::CmdIPC4->can('recv_cmd4');
 my $send_cmd = PublicInbox::CmdIPC4->can('send_cmd4') // do {
@@ -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);
@@ -74,30 +73,13 @@ connect($path): $! (after attempted daemon start)
 Falling back to (slow) one-shot mode
 
        }
-       require Cwd;
-       $pwd = $ENV{PWD} // '';
-       my $cwd = Cwd::fastcwd() // die "fastcwd(PWD=$pwd): $!";
-       if ($pwd ne $cwd) { # prefer ENV{PWD} if it's a symlink to real cwd
-               my @st_cwd = stat($cwd) or die "stat(cwd=$cwd): $!";
-               my @st_pwd = stat($pwd); # PWD invalid, use cwd
-               # make sure st_dev/st_ino match for {PWD} to be valid
-               $pwd = $cwd if (!@st_pwd || $st_pwd[1] != $st_cwd[1] ||
-                                       $st_pwd[0] != $st_cwd[0]);
-       } else {
-               $pwd = $cwd;
-       }
        1;
 }) { # (Socket::MsgHdr|Inline::C), $sock, $pwd are all available:
-       $ENV{PWD} = $pwd;
+       open my $dh, '<', '.' or die "open(.) $!";
        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 ], $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);
        my $x_it_code = 0;
        while (1) {
                my (@fds) = $recv_cmd->($sock, $buf, 4096 * 33);
@@ -110,6 +92,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 {