From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 2/3] gcf2: fix autodie usage for older Perl
Date: Wed, 15 Nov 2023 04:32:38 +0000 [thread overview]
Message-ID: <20231115043239.1069219-3-e@80x24.org> (raw)
In-Reply-To: <20231115043239.1069219-1-e@80x24.org>
At least on Perl v5.16.3 on CentOS 7.x, use-ing autodie within
BEGIN {} affects all subroutines in that package, too. So just
use autodie at the top-level and rely on CORE::* and try_cat
to handle cases where autodie isn't desired.
---
lib/PublicInbox/Gcf2.pm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/lib/PublicInbox/Gcf2.pm b/lib/PublicInbox/Gcf2.pm
index e0219b55..dcbb201d 100644
--- a/lib/PublicInbox/Gcf2.pm
+++ b/lib/PublicInbox/Gcf2.pm
@@ -11,10 +11,9 @@ use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use IO::Handle; # autoflush
use PublicInbox::Git;
use PublicInbox::Lock;
-use autodie qw(close);
+use autodie qw(close open seek truncate);
BEGIN {
- use autodie;
my (%CFG, $c_src);
# PublicInbox::Spawn will set PERL_INLINE_DIRECTORY
# to ~/.cache/public-inbox/inline-c if it exists and Inline::C works
@@ -80,9 +79,8 @@ sub add_alt ($$) {
# to refer to $V2INBOX_DIR/git/$EPOCH.git/objects
#
# See https://bugs.debian.org/975607
- if (open(my $fh, '<', "$objdir/info/alternates")) {
- chomp(my @abs_alt = grep m!^/!, PublicInbox::IO::read_all $fh);
- $gcf2->add_alternate($_) for @abs_alt;
+ if (my $s = PublicInbox::IO::try_cat("$objdir/info/alternates")) {
+ $gcf2->add_alternate($_) for ($s =~ m!^(/[^\n]+)\n!gms);
}
$gcf2->add_alternate($objdir);
1;
@@ -92,8 +90,9 @@ sub have_unlinked_files () {
# FIXME: port gcf2-like over to git.git so we won't need to
# deal with libgit2
return 1 if $^O ne 'linux';
- open my $fh, '<', "/proc/$$/maps" or return;
- while (<$fh>) { return 1 if /\.(?:idx|pack) \(deleted\)$/ }
+ if (my $s = PublicInbox::IO::try_cat("/proc/$$/maps")) {
+ return 1 if /\.(?:idx|pack) \(deleted\)/s;
+ }
undef;
}
next prev parent reply other threads:[~2023-11-15 4:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-15 4:32 [PATCH 0/3] libgit2 fixes for CentOS 7.x users Eric Wong
2023-11-15 4:32 ` [PATCH 1/3] gcf2client: add alias for PublicInbox::Git::fail Eric Wong
2023-11-15 4:32 ` Eric Wong [this message]
2023-11-15 4:32 ` [PATCH 3/3] treewide: more autodie safety fixes for older Perl Eric Wong
2023-11-15 8:24 ` [PATCH 4/3] xap_helper_cxx: accept leading spaces from pkg-config Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231115043239.1069219-3-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).