From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id A92D11FA12 for ; Mon, 10 Aug 2020 02:12:06 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 07/14] avoid File::Temp::tempfile in more places Date: Mon, 10 Aug 2020 02:11:58 +0000 Message-Id: <20200810021205.18909-8-e@yhbt.net> In-Reply-To: <20200810021205.18909-1-e@yhbt.net> References: <20200810021205.18909-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: We can use open(..., undef) natively in Perl in t/import.t In places where we need a pathname, the File::Temp OO API gives us auto-unlinking for free. --- lib/PublicInbox/V2Writable.pm | 17 +++++++++-------- script/public-inbox-init | 9 ++++----- t/import.t | 5 ++--- 3 files changed, 15 insertions(+), 16 deletions(-) diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm index 0b527f18..93646e57 100644 --- a/lib/PublicInbox/V2Writable.pm +++ b/lib/PublicInbox/V2Writable.pm @@ -20,7 +20,7 @@ use PublicInbox::Msgmap; use PublicInbox::Spawn qw(spawn popen_rd); use PublicInbox::SearchIdx qw(log2stack crlf_adjust is_ancestor check_size); use IO::Handle; # ->autoflush -use File::Temp qw(tempfile); +use File::Temp (); my $OID = qr/[a-f0-9]{40,}/; # an estimate of the post-packed size to the raw uncompressed size @@ -733,12 +733,14 @@ sub fill_alternates ($$) { } return unless $new; - my ($fh, $tmp) = tempfile('alt-XXXXXXXX', DIR => $info_dir); + my $fh = File::Temp->new(TEMPLATE => 'alt-XXXXXXXX', DIR => $info_dir); + my $tmp = $fh->filename; print $fh join("\n", sort { $alt{$b} <=> $alt{$a} } keys %alt), "\n" or die "print $tmp: $!\n"; chmod($mode, $fh) or die "fchmod $tmp: $!\n"; close $fh or die "close $tmp $!\n"; rename($tmp, $alt) or die "rename $tmp => $alt: $!\n"; + $fh->unlink_on_destroy(0); } sub git_init { @@ -819,18 +821,17 @@ sub import_init { sub diff ($$$) { my ($mid, $cur, $new) = @_; - my ($ah, $an) = tempfile('email-cur-XXXXXXXX', TMPDIR => 1); + my $ah = File::Temp->new(TEMPLATE => 'email-cur-XXXXXXXX', TMPDIR => 1); print $ah $cur->as_string or die "print: $!"; - close $ah or die "close: $!"; - my ($bh, $bn) = tempfile('email-new-XXXXXXXX', TMPDIR => 1); + $ah->flush or die "flush: $!"; PublicInbox::Import::drop_unwanted_headers($new); + my $bh = File::Temp->new(TEMPLATE => 'email-new-XXXXXXXX', TMPDIR => 1); print $bh $new->as_string or die "print: $!"; - close $bh or die "close: $!"; - my $cmd = [ qw(diff -u), $an, $bn ]; + $bh->flush or die "flush: $!"; + my $cmd = [ qw(diff -u), $ah->filename, $bh->filename ]; print STDERR "# MID conflict <$mid>\n"; my $pid = spawn($cmd, undef, { 1 => 2 }); waitpid($pid, 0) == $pid or die "diff did not finish"; - unlink($an, $bn); } sub get_blob ($$) { diff --git a/script/public-inbox-init b/script/public-inbox-init index b8d71f35..6a959db7 100755 --- a/script/public-inbox-init +++ b/script/public-inbox-init @@ -17,7 +17,7 @@ PublicInbox::Admin::require_or_die('-base'); use PublicInbox::Config; use PublicInbox::InboxWritable; use PublicInbox::Import; -use File::Temp qw/tempfile/; +use File::Temp; use PublicInbox::Lock; use File::Basename qw/dirname/; use File::Path qw/mkpath/; @@ -52,8 +52,7 @@ my $lock_obj = { lock_path => "$pi_config.flock" }; PublicInbox::Lock::lock_acquire($lock_obj); # git-config will operate on this (and rename on success): -my ($fh, $pi_config_tmp) = tempfile('pi-init-XXXXXXXX', DIR => $dir); -my $cfg_tmp = UnlinkMe->new($pi_config_tmp); +my $fh = File::Temp->new(TEMPLATE => 'pi-init-XXXXXXXX', DIR => $dir); # Now, we grab another lock to use git-config(1) locking, so it won't # wait on the lock, unlike some of our internal flock()-based locks. @@ -110,7 +109,8 @@ if (-e $pi_config) { } } } -close $fh or die "failed to close $pi_config_tmp: $!\n"; +my $pi_config_tmp = $fh->filename; +close($fh) or die "failed to close $pi_config_tmp: $!\n"; my $pfx = "publicinbox.$name"; my @x = (qw/git config/, "--file=$pi_config_tmp"); @@ -177,7 +177,6 @@ if (defined $perm) { rename $pi_config_tmp, $pi_config or die "failed to rename `$pi_config_tmp' to `$pi_config': $!\n"; -delete $cfg_tmp->{file}; $auto_unlink->DESTROY; package UnlinkMe; diff --git a/t/import.t b/t/import.t index 440e8994..9a88416f 100644 --- a/t/import.t +++ b/t/import.t @@ -9,7 +9,6 @@ use PublicInbox::Git; use PublicInbox::Import; use PublicInbox::Spawn qw(spawn); use Fcntl qw(:DEFAULT SEEK_SET); -use File::Temp qw/tempfile/; use PublicInbox::TestCommon; use MIME::Base64 3.05; # Perl 5.10.0 / 5.9.2 my ($dir, $for_destroy) = tmpdir(); @@ -37,11 +36,11 @@ if ($v2) { is($mime->as_string, $$raw_email, 'string matches'); is($smsg->{raw_bytes}, length($$raw_email), 'length matches'); my @cmd = ('git', "--git-dir=$git->{git_dir}", qw(hash-object --stdin)); - my $in = tempfile(); + open my $in, '+<', undef or BAIL_OUT "open(+<): $!"; print $in $mime->as_string or die "write failed: $!"; $in->flush or die "flush failed: $!"; seek($in, 0, SEEK_SET); - my $out = tempfile(); + open my $out, '+<', undef or BAIL_OUT "open(+<): $!"; my $pid = spawn(\@cmd, {}, { 0 => $in, 1 => $out }); is(waitpid($pid, 0), $pid, 'waitpid succeeds on hash-object'); is($?, 0, 'hash-object');