X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=script%2Flei;h=5feb77515d0f4a10c9fe8b67f859f8232f11e113;hp=399296ba1a8d453597e93dc0cb9dfa9b7c99b916;hb=refs%2Fheads%2Fmaster;hpb=5c7d3f916da9a9c93419282e943a7d45c53b9c86 diff --git a/script/lei b/script/lei index 399296ba..5feb7751 100755 --- a/script/lei +++ b/script/lei @@ -1,14 +1,17 @@ #!perl -w -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ -use strict; -use v5.10.1; +use v5.12; use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un); use PublicInbox::CmdIPC4; my $narg = 5; my $sock; my $recv_cmd = PublicInbox::CmdIPC4->can('recv_cmd4'); my $send_cmd = PublicInbox::CmdIPC4->can('send_cmd4') // do { + require PublicInbox::Syscall; + $recv_cmd = PublicInbox::Syscall->can('recv_cmd4'); + PublicInbox::Syscall->can('send_cmd4'); +} // do { my $inline_dir = $ENV{PERL_INLINE_DIRECTORY} //= ( $ENV{XDG_CACHE_HOME} // ( ($ENV{HOME} // '/nonexistent').'/.cache' ) @@ -107,8 +110,8 @@ 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_cmd->($sock, [], 'STOP', MSG_EOR); kill 'STOP', $$ }; -$SIG{CONT} = sub { $send_cmd->($sock, [], 'CONT', MSG_EOR) }; +$SIG{TSTP} = sub { send($sock, 'STOP', MSG_EOR); kill 'STOP', $$ }; +$SIG{CONT} = sub { send($sock, 'CONT', MSG_EOR) }; my $x_it_code = 0; while (1) { @@ -122,6 +125,8 @@ while (1) { $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: $!" } elsif ($buf =~ /\Ax_it ([0-9]+)\z/) { $x_it_code ||= $1 + 0; last; @@ -137,6 +142,6 @@ while (1) { $sigchld->(); if (my $sig = ($x_it_code & 127)) { kill $sig, $$; - sleep(1) while 1; + sleep(1) while 1; # no self-pipe/signalfd, here, so we loop } exit($x_it_code >> 8);