update copyrights for 2021

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

diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm
index 0b2685b08e7be3b4a14a0523b3cf6c9e3b0686e6..851c015bee36847f8e640dbdee0743e76c2afd0f 100644 (file)
--- a/lib/PublicInbox/LeiToMail.pm
+++ b/lib/PublicInbox/LeiToMail.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2020-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # Writes PublicInbox::Eml objects atomically to a mbox variant or Maildir
@@ -13,7 +13,7 @@ use PublicInbox::LeiDedupe;
 use Symbol qw(gensym);
 use IO::Handle; # ->autoflush
 use Fcntl qw(SEEK_SET SEEK_END O_CREAT O_EXCL O_WRONLY);
-use Errno qw(EEXIST ESPIPE);
+use Errno qw(EEXIST ESPIPE ENOENT);
 
 my %kw2char = ( # Maildir characters
        draft => 'D',
@@ -230,8 +230,12 @@ sub _mbox_write_cb ($$$$) {
        # XXX should we support /dev/stdout.gz ?
        if ($dst eq '/dev/stdout') {
                $out = $lei->{1};
-       } else { # TODO: mbox locking
-               open $out, '+>>', $dst or die "open $dst: $!";
+       } else { # TODO: mbox locking (but mairix doesn't...)
+               my $mode = -p $dst ? '>' : '+>>';
+               if (-f _ && !$lei->{opt}->{augment} and !unlink($dst)) {
+                       die "unlink $dst: $!" if $! != ENOENT;
+               }
+               open $out, $mode, $dst or die "open $dst: $!";
                # Perl does SEEK_END even with O_APPEND :<
                $seekable = seek($out, 0, SEEK_SET);
                die "seek $dst: $!\n" if !$seekable && $! != ESPIPE;
@@ -251,8 +255,6 @@ sub _mbox_write_cb ($$$$) {
                # maybe some systems don't honor O_APPEND, Perl does this:
                seek($out, 0, SEEK_END) or die "seek $dst: $!";
                $dedupe->pause_dedupe if $jobs; # are we forking?
-       } elsif ($seekable) {
-               truncate($out, 0) or die "truncate $dst: $!";
        }
        $dedupe->prepare_dedupe if !$jobs;
        ($out, $pipe_lk) = compress_dst($out, $zsfx, $lei) if $zsfx;