X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FGit.pm;h=8426cc7d6a705488e8dded3bd0691fd412e0a372;hb=2e168e869df3f1ca88f2eb22a8d1a1dda869b6ef;hp=4f230197186d9af21da28494d8a13ecc81af38f2;hpb=c5c709dcef1b5904467ff2aea3943f00a891dade;p=public-inbox.git

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 4f230197..8426cc7d 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
 # License: GPLv2 or later <https://www.gnu.org/licenses/gpl-2.0.txt>
 #
 # Used to read files from a git repository without excessive forking.
@@ -9,7 +9,7 @@
 package PublicInbox::Git;
 use strict;
 use warnings;
-use POSIX qw(dup2);
+use POSIX ();
 use IO::Handle; # ->autoflush
 use File::Glob qw(bsd_glob GLOB_NOSORT);
 use PublicInbox::Spawn qw(popen_rd);
@@ -55,10 +55,8 @@ sub git_quote ($) {
 
 sub new {
 	my ($class, $git_dir) = @_;
-	my @st;
-	$st[7] = $st[10] = 0;
 	# may contain {-tmp} field for File::Temp::Dir
-	bless { git_dir => $git_dir, st => \@st, -git_path => {} }, $class
+	bless { git_dir => $git_dir, alt_st => '', -git_path => {} }, $class
 }
 
 sub git_path ($$) {
@@ -79,10 +77,11 @@ sub alternates_changed {
 	my ($self) = @_;
 	my $alt = git_path($self, 'objects/info/alternates');
 	my @st = stat($alt) or return 0;
-	my $old_st = $self->{st};
-	# 10 - ctime, 7 - size
-	return 0 if ($st[10] == $old_st->[10] && $st[7] == $old_st->[7]);
-	$self->{st} = \@st;
+
+	# can't rely on 'q' on some 32-bit builds, but `d' works
+	my $st = pack('dd', $st[10], $st[7]); # 10: ctime, 7: size
+	return 0 if $self->{alt_st} eq $st;
+	$self->{alt_st} = $st; # always a true value
 }
 
 sub last_check_err {
@@ -126,59 +125,49 @@ sub _bidi_pipe {
 	$self->{$in} = $in_r;
 }
 
-sub read_cat_in_full ($$$) {
-	my ($self, $in, $left) = @_;
-	my $offset = 0;
-	my $buf = '';
-	while ($left > 0) {
-		my $r = read($in, $buf, $left, $offset);
-		defined($r) or fail($self, "read failed: $!");
-		$r == 0 and fail($self, 'exited unexpectedly');
-		$left -= $r;
-		$offset += $r;
-	}
-	my $r = read($in, my $lf, 1);
-	defined($r) or fail($self, "read failed: $!");
-	fail($self, 'newline missing after blob') if ($r != 1 || $lf ne "\n");
+sub read_cat_in_full ($$) {
+	my ($self, $len) = @_;
+	++$len; # for final "\n" added by git
+	read($self->{in}, my $buf, $len) == $len or fail($self, 'short read');
+	chop($buf) eq "\n" or fail($self, 'newline missing after blob');
 	\$buf;
 }
 
-sub _cat_async_step ($$$) {
-	my ($self, $inflight, $in) = @_;
+sub _cat_async_step ($$) {
+	my ($self, $inflight) = @_;
 	my $pair = shift @$inflight or die 'BUG: inflight empty';
 	my ($cb, $arg) = @$pair;
 	local $/ = "\n";
-	my $head = $in->getline;
+	my $head = readline($self->{in});
 	$head =~ / missing$/ and return
 		eval { $cb->(undef, undef, undef, undef, $arg) };
 
 	$head =~ /^([0-9a-f]{40}) (\S+) ([0-9]+)$/ or
 		fail($self, "Unexpected result from async git cat-file: $head");
 	my ($oid_hex, $type, $size) = ($1, $2, $3 + 0);
-	my $bref = read_cat_in_full($self, $in, $size);
+	my $bref = read_cat_in_full($self, $size);
 	eval { $cb->($bref, $oid_hex, $type, $size, $arg) };
+	warn "E: $oid_hex $@\n" if $@;
 }
 
 sub cat_async_wait ($) {
 	my ($self) = @_;
 	my $inflight = delete $self->{inflight} or return;
-	my $in = $self->{in};
 	while (scalar(@$inflight)) {
-		_cat_async_step($self, $inflight, $in);
+		_cat_async_step($self, $inflight);
 	}
 }
 
 sub cat_file {
 	my ($self, $obj, $ref) = @_;
-	my ($retried, $in, $head);
+	my ($retried, $head);
 	cat_async_wait($self);
 again:
 	batch_prepare($self);
-	$self->{out}->print($obj, "\n") or fail($self, "write error: $!");
+	print { $self->{out} } $obj, "\n" or fail($self, "write error: $!");
 
-	$in = $self->{in};
 	local $/ = "\n";
-	$head = $in->getline;
+	$head = readline($self->{in});
 	if ($head =~ / missing$/) {
 		if (!$retried && alternates_changed($self)) {
 			$retried = 1;
@@ -192,7 +181,7 @@ again:
 
 	my $size = $1;
 	$$ref = $size if $ref;
-	read_cat_in_full($self, $in, $size);
+	read_cat_in_full($self, $size);
 }
 
 sub batch_prepare ($) { _bidi_pipe($_[0], qw(--batch in out pid)) }
@@ -200,9 +189,9 @@ sub batch_prepare ($) { _bidi_pipe($_[0], qw(--batch in out pid)) }
 sub check {
 	my ($self, $obj) = @_;
 	_bidi_pipe($self, qw(--batch-check in_c out_c pid_c err_c));
-	$self->{out_c}->print($obj, "\n") or fail($self, "write error: $!");
+	print { $self->{out_c} } $obj, "\n" or fail($self, "write error: $!");
 	local $/ = "\n";
-	chomp(my $line = $self->{in_c}->getline);
+	chomp(my $line = readline($self->{in_c}));
 	my ($hex, $type, $size) = split(' ', $line);
 
 	# Future versions of git.git may show 'ambiguous', but for now,
@@ -321,10 +310,10 @@ sub cat_async ($$$;$) {
 	my ($self, $oid, $cb, $arg) = @_;
 	my $inflight = $self->{inflight} or die 'BUG: not in async';
 	if (scalar(@$inflight) >= MAX_INFLIGHT) {
-		_cat_async_step($self, $inflight, $self->{in});
+		_cat_async_step($self, $inflight);
 	}
 
-	$self->{out}->print($oid, "\n") or fail($self, "write error: $!");
+	print { $self->{out} } $oid, "\n" or fail($self, "write error: $!");
 	push(@$inflight, [ $cb, $arg ]);
 }