`readline' ops may not detect errors on partial reads.
This saves us some code to reduce cognitive overhead for
readers. We'll also support reusing a destination buffers so it
can work more nicely with existing code.
use Fcntl qw(SEEK_SET);
use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC);
use IO::Handle; # autoflush
-use PublicInbox::Git;
+use PublicInbox::Git qw(read_all);
use PublicInbox::Lock;
BEGIN {
# build them.
my $f = "$dir/gcf2_libgit2.h";
open my $src, '<', $f;
- local $/;
- $c_src = <$src> // die "read $f: $!";
+ $c_src = read_all($src);
}
unless ($c_src) {
seek($err, 0, SEEK_SET);
- $err = do { local $/; <$err> };
+ $err = read_all($err);
die "E: libgit2 not installed: $err\n";
}
# append pkg-config results to the source to ensure Inline::C
# 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);
+sub read_all ($;$$) {
+ my ($fh, $len, $bref) = @_;
+ $bref //= \(my $buf);
+ my $r = read($fh, $$bref, $len //= -s $fh);
croak("$fh read ($r != $len)") if $len != $r;
- $buf;
+ $$bref;
}
sub try_cat {
use v5.10.1;
use parent qw(PublicInbox::Inbox PublicInbox::Umask Exporter);
use PublicInbox::Import;
+use PublicInbox::Git qw(read_all);
use PublicInbox::Filter::Base qw(REJECT);
use Errno qw(ENOENT);
our @EXPORT_OK = qw(eml_from_path);
sub eml_from_path ($) {
my ($path) = @_;
if (sysopen(my $fh, $path, O_RDONLY|O_NONBLOCK)) {
- return unless -f $fh; # no FIFOs or directories
- my $str = do { local $/; <$fh> } or return;
- PublicInbox::Eml->new(\$str);
+ return unless -f $fh && -s _; # no FIFOs or directories
+ PublicInbox::Eml->new(\(my $str = read_all($fh, -s _)));
} else { # ENOENT is common with Maildir
warn "failed to open $path: $!\n" if $! != ENOENT;
undef;
use strict;
use v5.10.1;
use parent qw(PublicInbox::LeiSearch PublicInbox::Lock);
-use PublicInbox::Git;
+use PublicInbox::Git qw(read_all);
use PublicInbox::Import;
use PublicInbox::LeiXSearch;
use Fcntl qw(SEEK_SET);
$self->git->cleanup;
my $lk = $self->lock_for_scope;
my $cur_lxs = ref($lxs)->new;
- my $orig = do {
- local $/;
- readline($self->{lockfh}) //
- die "readline($self->{lock_path}): $!";
- };
+ my $orig = read_all($self->{lockfh});
my $new = '';
my $old = '';
my $gone = 0;
$new = $old = '';
my $f = $self->git->{git_dir}.'/objects/info/alternates';
if (open my $fh, '<', $f) {
- local $/;
- $old = <$fh> // die "readline($f): $!";
+ read_all($fh, -s $fh, \$old);
}
for my $x (@ibxish) {
$new .= $lei->canonpath_harder($x->git->{git_dir})."/objects\n";
use PublicInbox::Spawn qw(run_wait popen_rd which);
use PublicInbox::DS;
use PublicInbox::Eml;
+use PublicInbox::Git qw(read_all);
sub get_git_dir ($$) {
my ($lei, $d) = @_;
extract_attach($lei, $blob, $bref) :
$lei->out($$bref);
if ($opt->{mail}) {
- my $eh = $rdr->{2};
- seek($eh, 0, 0);
- return $lei->child_error($cerr, do { local $/; <$eh> });
+ seek($rdr->{2}, 0, 0);
+ return $lei->child_error($cerr, read_all($rdr->{2}));
} # else: fall through to solver below
}
$lei->cfg_dump($self->{-f});
} or do {
seek($fh, 0, SEEK_SET);
- return cfg_do_edit($self, do { local $/; <$fh> });
+ return cfg_do_edit($self, read_all($fh));
};
$self->cfg_verify($cfg) if $self->can('cfg_verify');
}
use DBI qw(:sql_types); # SQL_BLOB
use PublicInbox::ContentHash qw(git_sha);
use Carp ();
-use PublicInbox::Git qw(%HEXLEN2SHA);
+use PublicInbox::Git qw(%HEXLEN2SHA read_all);
sub dbh_new {
my ($self) = @_;
open my $fh, '<', $f or next;
# some (buggy) Maildir writers are non-atomic:
next unless -s $fh;
- local $/;
- my $raw = <$fh>;
+ my $raw = read_all($fh, -s _);
if ($vrfy) {
my $sha = $HEXLEN2SHA{length($oidhex)};
my $got = git_sha($sha, \$raw)->hexdigest;
use POSIX ();
use PublicInbox::Config;
use PublicInbox::IPC;
+use PublicInbox::Git qw(read_all);
sub lei_sucks {
my ($lei, @argv) = @_;
for my $m (grep(m{^PublicInbox/}, sort keys %INC)) {
my $f = $INC{$m} // next; # lazy require failed (missing dep)
open my $fh, '<', $f or do { warn "open($f): $!"; next };
- my $hex = sha1_hex('blob '.(-s $fh)."\0".
- (do { local $/; <$fh> } // die("read: $!")));
+ my $size = -s $fh;
+ my $hex = sha1_hex("blob $size\0".read_all($fh, $size));
push @out, ' '.$hex.' '.$m."\n";
}
push @out, <<'EOM';
use PublicInbox::Import;
use File::Temp 0.19;
use List::Util qw(max);
+use PublicInbox::Git qw(read_all);
sub new {
my ($cls, $topdir, $all, $epfx) = @_;
qr!\A\Q../../$self->{epfx}\E/([0-9]+)\.git/objects\z! :
undef;
$$moderef = (stat($fh))[2] & 07777;
- for my $rel (split(/^/m, do { local $/; <$fh> })) {
+ for my $rel (split(/^/m, read_all($fh, -s _))) {
chomp(my $dir = $rel);
my $score;
if (defined($is_edir) && $dir =~ $is_edir) {
use v5.10.1;
use File::Temp 0.19 (); # newdir
use PublicInbox::SolverGit;
+use PublicInbox::Git qw(read_all);
use PublicInbox::GitAsyncCat;
use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::Linkify;
warn "seek(log): $!";
return '<pre>debug log seek error</pre>';
}
- $log = do { local $/; <$log> } // do {
- if (!eof($log)) {
- warn "readline(log): $!";
- return '<pre>debug log read error</pre>';
- }
- '';
+ $log = eval { read_all($log) } // do {
+ warn "read(log): $@";
+ return '<pre>debug log read error</pre>';
};
return '' if $log eq '';
$ctx->{-linkify} //= PublicInbox::Linkify->new;
if (-s $fh > $MAX_SIZE) {
print $zfh "---\n patch is too large to show\n";
} else { # prepare flush_diff:
- read($fh, $x, -s _);
+ read_all($fh, -s _, \$x);
utf8_maybe($x);
$ctx->{-apfx} = $ctx->{-spfx} = $upfx;
$x =~ s/\r?\n/\n/gs;
next;
};
my $ctime = 0;
- my $local = do { local $/; <$fh> };
+ my $local = read_all($fh, -s $fh);
if ($local =~ /\S/) {
- $ctime = sprintf('%x',(stat($fh))[10]);
+ $ctime = sprintf('%x',(stat(_))[10]);
$local = $mini->($local);
}
use PublicInbox::Search qw(xap_terms);
use PublicInbox::CodeSearch;
use PublicInbox::IPC;
+use PublicInbox::Git qw(read_all);
use Socket qw(SOL_SOCKET SO_TYPE SOCK_SEQPACKET AF_UNIX);
use PublicInbox::DS qw(awaitpid);
use POSIX qw(:signal_h);
$req->{A} or return warn('dump_roots requires -A PREFIX');
open my $fh, '<', $root2id_file or die "open($root2id_file): $!";
my $root2id; # record format: $OIDHEX "\0" uint32_t
- my @x = split(/\0/, do { local $/; <$fh> } // die "readline: $!");
+ my @x = split(/\0/, read_all($fh));
while (@x) {
my $oidhex = shift @x;
$root2id->{$oidhex} = shift @x;
package PublicInbox::XapHelperCxx;
use v5.12;
use PublicInbox::Spawn qw(popen_rd which);
+use PublicInbox::Git qw(read_all);
use PublicInbox::Search;
use Fcntl qw(SEEK_SET);
use Config;
chomp(my $ret = do { local $/; <$rd> });
return $ret if close($rd);
seek($err, 0, SEEK_SET) or die "seek: $!";
- $err = do { local $/; <$err> };
+ $err = read_all($err);
die <<EOM;
@$cmd failed: Xapian development files missing? (\$?=$?)
$err
for (@srcs) {
say $fh qq(# line 1 "$_");
open my $rfh, '<', $_;
- local $/;
- print $fh readline($rfh);
+ print $fh read_all($rfh);
}
print $fh PublicInbox::Search::generate_cxx();
print $fh PublicInbox::CodeSearch::generate_cxx();
use PublicInbox::Eml;
use PublicInbox::InboxWritable qw(eml_from_path);
use PublicInbox::Import;
+use PublicInbox::Git qw(read_all);
my $help = <<'EOF';
usage: public-inbox-edit -m MESSAGE-ID [--all] [INBOX_DIRS]
# rename/relink $edit_fn
open my $new_fh, '<', $edit_fn or
die "can't read edited file ($edit_fn): $!\n";
- defined(my $new_raw = do { local $/; <$new_fh> }) or die
- "read $edit_fn: $!\n";
+ my $new_raw = read_all($new_fh);
if (!$opt->{raw}) {
PublicInbox::Eml::strip_from($new_raw);
my $perm = 0644 & ~umask;
my %seen;
if (-e $pi_config) {
+ require PublicInbox::Git;
open(my $oh, '<', $pi_config) or die "unable to read $pi_config: $!\n";
my @st = stat($oh);
$perm = $st[2];
defined $perm or die "(f)stat failed on $pi_config: $!\n";
chmod($perm & 07777, $fh) or
die "(f)chmod failed on future $pi_config: $!\n";
- defined(my $old = do { local $/; <$oh> }) or die "read $pi_config: $!\n";
+ my $old = PublicInbox::Git::read_all($oh);
print $fh $old or die "failed to write: $!\n";
close $oh or die "failed to close $pi_config: $!\n";
projects / thirdparty / public-inbox.git / commitdiff
