cmd_ipc: support + test EINTR + EAGAIN, no FDs

[public-inbox.git] / lib / PublicInbox / CmdIPC4.pm

diff --git a/lib/PublicInbox/CmdIPC4.pm b/lib/PublicInbox/CmdIPC4.pm
index c4fcb0d679d9256319ab6f5b45e86d72772256e4..c244f6a1a7c7c2d177498c2f275cda55e9cb7842 100644 (file)
--- a/lib/PublicInbox/CmdIPC4.pm
+++ b/lib/PublicInbox/CmdIPC4.pm
@@ -18,17 +18,17 @@ no warnings 'once';
        my $mh = Socket::MsgHdr->new(buf => $_[2]);
        $mh->cmsghdr(SOL_SOCKET, SCM_RIGHTS,
                        pack('i' x scalar(@$fds), @$fds));
-       Socket::MsgHdr::sendmsg($sock, $mh, $flags) or die "sendmsg: $!";
+       Socket::MsgHdr::sendmsg($sock, $mh, $flags);
 };
 
 *recv_cmd4 = sub ($$$) {
        my ($s, undef, $len) = @_; # $_[1] = destination buffer
        my $mh = Socket::MsgHdr->new(buflen => $len, controllen => 256);
-       my $r = Socket::MsgHdr::recvmsg($s, $mh, 0) // die "recvmsg: $!";
+       my $r = Socket::MsgHdr::recvmsg($s, $mh, 0) // return ($_[1] = undef);
        $_[1] = $mh->buf;
        return () if $r == 0;
        my (undef, undef, $data) = $mh->cmsghdr;
-       unpack('i' x (length($data) / 4), $data);
+       defined($data) ? unpack('i' x (length($data) / 4), $data) : ();
 };
 
 } } # /eval /BEGIN