treewide: "require" + "use" cleanup and docs

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

diff --git a/lib/PublicInbox/Tmpfile.pm b/lib/PublicInbox/Tmpfile.pm
index 7fda100e24da11f932950989a327fe1d7bb62424..05f359d844cb0fc8f74ca9af461ff928405ae39e 100644 (file)
--- a/lib/PublicInbox/Tmpfile.pm
+++ b/lib/PublicInbox/Tmpfile.pm
@@ -7,15 +7,14 @@ use base qw(Exporter);
 our @EXPORT = qw(tmpfile);
 use Fcntl qw(:DEFAULT);
 use Errno qw(EEXIST);
-require File::Spec;
+use File::Spec;
 
 # use tmpfile instead of open(..., '+>', undef) so we can get an
 # unlinked filename which makes sense when viewed with lsof
 # (at least on Linux)
-# TODO: O_APPEND support (this is the reason I'm not using File::Temp)
 # And if we ever stop caring to have debuggable filenames, O_TMPFILE :)
-sub tmpfile ($;$) {
-       my ($id, $sock) = @_;
+sub tmpfile ($;$$) {
+       my ($id, $sock, $append) = @_;
        if (defined $sock) {
                # add the socket inode number so we can figure out which
                # socket it belongs to
@@ -25,10 +24,11 @@ sub tmpfile ($;$) {
        $id =~ tr!/!^!;
 
        my $fl = O_RDWR | O_CREAT | O_EXCL;
+       $fl |= O_APPEND if $append;
        do {
                my $fn = File::Spec->tmpdir . "/$id-".time.'-'.rand;
                if (sysopen(my $fh, $fn, $fl, 0600)) { # likely
-                       unlink($fn) or die "unlink($fn): $!"; # FS broken
+                       unlink($fn) or warn "unlink($fn): $!"; # FS broken
                        return $fh; # success
                }
        } while ($! == EEXIST);