X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FTmpfile.pm;h=25bb3a52720e42748ad6d8642102439a1382b51e;hb=95bdac7f09c69036efed537a4d03d5bdd2ae4eb6;hp=7fda100e24da11f932950989a327fe1d7bb62424;hpb=e5631087d3862823d0d4854a8dfc1258f91cb115;p=public-inbox.git

diff --git a/lib/PublicInbox/Tmpfile.pm b/lib/PublicInbox/Tmpfile.pm
index 7fda100e..25bb3a52 100644
--- a/lib/PublicInbox/Tmpfile.pm
+++ b/lib/PublicInbox/Tmpfile.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 package PublicInbox::Tmpfile;
 use strict;
@@ -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);