1 files changed, 8 insertions, 11 deletions
diff --git a/script/lei b/script/lei
index 5feb7751..087afc33 100755
--- a/script/lei
+++ b/script/lei
@@ -2,7 +2,7 @@
  # Copyright (C) all contributors <meta@public-inbox.org>
  # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
  use v5.12;
-use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un);
+use Socket qw(AF_UNIX SOCK_SEQPACKET pack_sockaddr_un);
  use PublicInbox::CmdIPC4;
  my $narg = 5;
  my $sock;
@@ -92,8 +92,8 @@ my $addr = pack_sockaddr_un($path);
  socket($sock, AF_UNIX, SOCK_SEQPACKET, 0) or die "socket: $!";
  unless (connect($sock, $addr)) { # start the daemon if not started
          local $ENV{PERL5LIB} = join(':', @INC);
-        open(my $daemon, '-|', $^X, qw[-MPublicInbox::LEI
-                -E PublicInbox::LEI::lazy_start(@ARGV)],
+        open(my $daemon, '-|', $^X, $^W ? ('-w') : (),
+                qw[-MPublicInbox::LEI -e PublicInbox::LEI::lazy_start(@ARGV)],
                  $path, $! + 0, $narg) or die "popen: $!";
          while (<$daemon>) { warn $_ } # EOF when STDERR is redirected
          close($daemon) or warn <<"";
@@ -109,24 +109,21 @@ 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, fileno($dh)], $buf, MSG_EOR) or die "sendmsg: $!";
-$SIG{TSTP} = sub { send($sock, 'STOP', MSG_EOR); kill 'STOP', $$ };
-$SIG{CONT} = sub { send($sock, 'CONT', MSG_EOR) };
+$send_cmd->($sock, [0, 1, 2, fileno($dh)], $buf, 0) or die "sendmsg: $!";
+$SIG{TSTP} = sub { send($sock, 'STOP', 0); kill 'STOP', $$ };
+$SIG{CONT} = sub { send($sock, 'CONT', 0) };
  
  my $x_it_code = 0;
  while (1) {
          my (@fds) = $recv_cmd->($sock, my $buf, 4096 * 33);
-        if (scalar(@fds) == 1 && !defined($fds[0])) {
-                next if $!{EINTR};
-                die "recvmsg: $!";
-        }
+        die "recvmsg: $!" if scalar(@fds) == 1 && !defined($fds[0]);
          last if $buf eq '';
          if ($buf =~ /\Aexec (.+)\z/) {
                  $exec_cmd->(\@fds, split(/\0/, $1));
          } elsif ($buf eq '-WINCH') {
                  kill($buf, @parent); # for MUA
          } elsif ($buf eq 'umask') {
-                send($sock, 'u'.pack('V', umask), MSG_EOR) or die "send: $!"
+                send($sock, 'u'.pack('V', umask), 0) or die "send: $!"
          } elsif ($buf =~ /\Ax_it ([0-9]+)\z/) {
                  $x_it_code ||= $1 + 0;
                  last;