diff options
author | Eric Wong <e@80x24.org> | 2023-10-17 23:37:49 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2023-10-18 20:50:22 +0000 |
commit | 849920715cc291fe9d519c21bb6f600cd85d6d37 (patch) | |
tree | 89feb9c16b08e3d4f70142f787adb0443137b107 /lib/PublicInbox/Git.pm | |
parent | f920e1774679df1a1d347156476b06f10e95f883 (diff) | |
download | public-inbox-849920715cc291fe9d519c21bb6f600cd85d6d37.tar.gz |
This makes it easier to improve error checking, since the `do { local $/; readline(FH) }' construct does not detect errors (autodie does not cover `readline' or `<FH>'). I'm not sure exactly where this should be, but PublicInbox::Git is used nearly everywhere in our code base and it's probably not worth creating a new package for it.
Diffstat (limited to 'lib/PublicInbox/Git.pm')
-rw-r--r-- | lib/PublicInbox/Git.pm | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 448cfaf7..35bd10ef 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -10,7 +10,7 @@ package PublicInbox::Git; use strict; use v5.10.1; use parent qw(Exporter PublicInbox::DS); -use autodie qw(socketpair); +use autodie qw(socketpair read); use POSIX (); use Socket qw(AF_UNIX SOCK_STREAM); use PublicInbox::Syscall qw(EPOLLIN EPOLLET); @@ -26,7 +26,7 @@ use Carp qw(croak carp); use PublicInbox::SHA (); our %HEXLEN2SHA = (40 => 1, 64 => 256); our %OFMT2HEXLEN = (sha1 => 40, sha256 => 64); -our @EXPORT_OK = qw(git_unquote git_quote %HEXLEN2SHA %OFMT2HEXLEN); +our @EXPORT_OK = qw(git_unquote git_quote %HEXLEN2SHA %OFMT2HEXLEN read_all); our $in_cleanup; our $RDTIMEO = 60_000; # milliseconds our $async_warn; # true in read-only daemons @@ -548,11 +548,19 @@ sub modified ($;$) { (split(/ /, <$fh> // time))[0] + 0; # integerize for JSON } +# read_all/try_cat can probably be moved somewhere else... + +sub read_all ($;$) { + my ($fh, $len) = @_; + my $r = read($fh, my $buf, $len //= -s $fh); + croak("$fh read ($r != $len)") if $len != $r; + $buf; +} + sub try_cat { my ($path) = @_; open(my $fh, '<', $path) or return ''; - local $/; - <$fh> // ''; + read_all($fh); } sub cat_desc ($) { @@ -606,7 +614,7 @@ sub manifest_entry { } } my $dig = PublicInbox::SHA->new(1); - while (read($sr, $buf, 65536)) { $dig->add($buf) } + while (CORE::read($sr, $buf, 65536)) { $dig->add($buf) } CORE::close $sr or return; # empty, uninitialized git repo $ent->{fingerprint} = $dig->hexdigest; $ent->{modified} = modified(undef, $mod); |