From: Eric Wong <e@80x24.org>
Date: Sun, 1 Oct 2023 09:54:25 +0000 (+0000)
Subject: lei_store: unlink stderr buffer early
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ecc9bb5667aee11a05004516306a9fb5cae32971;p=thirdparty%2Fpublic-inbox.git

lei_store: unlink stderr buffer early

While we're at it, ensure we clear the Perl internal EOF
marker before attempting to read the appended-to file
handle since newer Perl may leave the internal EOF marker set.
---

diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 727de0663..9923ec3f9 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -27,7 +27,7 @@ use PublicInbox::MDA;
 use PublicInbox::Spawn qw(spawn);
 use PublicInbox::MdirReader;
 use PublicInbox::LeiToMail;
-use File::Temp ();
+use File::Temp qw(tmpnam);
 use POSIX ();
 use IO::Handle (); # ->autoflush
 use Sys::Syslog qw(syslog openlog);
@@ -110,7 +110,9 @@ sub search {
 # follows the stderr file
 sub _tail_err {
 	my ($self) = @_;
-	print { $self->{-err_wr} } readline($self->{-tmp_err});
+	my $err = $self->{-tmp_err} // return;
+	$err->clearerr; # clear EOF marker
+	print { $self->{-err_wr} } readline($err);
 }
 
 sub eidx_init {
@@ -566,11 +568,10 @@ sub xchg_stderr {
 	_tail_err($self) if $self->{-err_wr};
 	my $dir = $self->{priv_eidx}->{topdir};
 	return unless -e $dir;
-	my $old = delete $self->{-tmp_err};
-	my $pfx = POSIX::strftime('%Y%m%d%H%M%S', gmtime(time));
-	my $err = File::Temp->new(TEMPLATE => "$pfx.$$.err-XXXX",
-				SUFFIX => '.err', DIR => $dir);
-	open STDERR, '>>', $err->filename or die "dup2: $!";
+	delete $self->{-tmp_err};
+	my ($err, $name) = tmpnam();
+	open STDERR, '>>', $name or die "dup2: $!";
+	unlink($name);
 	STDERR->autoflush(1); # shared with shard subprocesses
 	$self->{-tmp_err} = $err; # separate file description for RO access
 	undef;