X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=script%2Flei;h=5cad19d776034176552fa352cb6a4415022683e3;hb=6e0ac7612095397ef3b9e019f772d724c62eac5b;hp=fce8124acc95795d113583416f179927da66dbf1;hpb=82e141cdf4a00de174b0a919689d846bb387cbf5;p=public-inbox.git diff --git a/script/lei b/script/lei index fce8124a..5cad19d7 100755 --- a/script/lei +++ b/script/lei @@ -53,6 +53,7 @@ my $exec_cmd = sub { } my %env = map { split(/=/, $_, 2) } splice(@argv, $argc); @ENV{keys %env} = values %env; + umask 077; exec(@argv); warn "exec: @argv: $!\n"; POSIX::_exit(1); @@ -105,17 +106,15 @@ 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"; -my $n = $send_cmd->($sock, [0, 1, 2, fileno($dh)], $buf, MSG_EOR); -if (!$n) { - die "sendmsg: $! (check RLIMIT_NOFILE)\n" if $!{ETOOMANYREFS}; - die "sendmsg: $!\n"; -} +$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) }; + 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}; - last if $!{ECONNRESET}; die "recvmsg: $!"; } last if $buf eq ''; @@ -123,11 +122,15 @@ 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; } elsif ($buf =~ /\Achild_error ([0-9]+)\z/) { $x_it_code ||= $1 + 0; + } elsif ($buf eq 'wait') { + $sigchld->(); } else { $sigchld->(); die $buf; @@ -136,6 +139,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);