lei: use RENAME_NOREPLACE on Linux 3.15+

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 76e103c7c2351638902bac42cd6290488e9e761d..d33d27aec00646879c89f702b4c3610775f47b09 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -12,6 +12,7 @@ use PublicInbox::Spawn qw(spawn);
 use Symbol qw(gensym);
 use IO::Handle; # ->autoflush
 use Fcntl qw(SEEK_SET SEEK_END O_CREAT O_EXCL O_WRONLY);
+use PublicInbox::Syscall qw(rename_noreplace);
 
 my %kw2char = ( # Maildir characters
        draft => 'D',
@@ -132,6 +133,7 @@ sub eml2mboxcl2 {
 
 sub git_to_mail { # git->cat_async callback
        my ($bref, $oid, $type, $size, $arg) = @_;
+       $type // return; # called by git->async_abort
        my ($write_cb, $smsg) = @$arg;
        if ($type eq 'missing' && $smsg->{-lms_ro}) {
                if ($bref = $smsg->{-lms_ro}->local_blob($oid, 1)) {
@@ -261,10 +263,8 @@ sub _buf2maildir ($$$$) {
                $rand = '';
                do {
                        $base = $rand.$common.':2,'.kw2suffix($kw);
-               } while (!($ok = link($tmp, $dst.$base)) && $!{EEXIST} &&
-                       ($rand = _rand.','));
-               die "link($tmp, $dst$base): $!" unless $ok;
-               unlink($tmp) or warn "W: failed to unlink $tmp: $!\n";
+               } while (!($ok = rename_noreplace($tmp, $dst.$base)) &&
+                       $!{EEXIST} && ($rand = _rand.','));
                \$base;
        } else {
                my $err = "Error writing $smsg->{blob} to $dst: $!\n";