lei export-kw: don't recreate deleted IMAP folders

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index 2d84487a89dc5d27acd2771339b4525463198b30..5cad19d776034176552fa352cb6a4415022683e3 100755 (executable)
--- 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,11 +106,10 @@ 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);
@@ -122,6 +122,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 +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);