www_stream: note existence of IMAP and NNTP URLs

[public-inbox.git] / lib / PublicInbox / Gcf2.pm

diff --git a/lib/PublicInbox/Gcf2.pm b/lib/PublicInbox/Gcf2.pm
index 0d5c8c5702d468d07ddf15c38a47cca8595883f4..0d31b01462a7dfb486f5e6f072bc248fc5a3c363 100644 (file)
--- a/lib/PublicInbox/Gcf2.pm
+++ b/lib/PublicInbox/Gcf2.pm
@@ -5,18 +5,20 @@
 # other libgit2 stuff may go here, too.
 package PublicInbox::Gcf2;
 use strict;
-use PublicInbox::Spawn qw(which popen_rd);
-use Fcntl qw(LOCK_EX);
+use v5.10.1;
+use PublicInbox::Spawn qw(which popen_rd); # may set PERL_INLINE_DIRECTORY
+use Fcntl qw(LOCK_EX SEEK_SET);
 use IO::Handle; # autoflush
-my (%CFG, $c_src, $lockfh);
 BEGIN {
+       my (%CFG, $c_src);
        # PublicInbox::Spawn will set PERL_INLINE_DIRECTORY
        # to ~/.cache/public-inbox/inline-c if it exists
        my $inline_dir = $ENV{PERL_INLINE_DIRECTORY} //
                die 'PERL_INLINE_DIRECTORY not defined';
        my $f = "$inline_dir/.public-inbox.lock";
-       open $lockfh, '>', $f or die "failed to open $f: $!\n";
-       my $pc = which($ENV{PKG_CONFIG} // 'pkg-config');
+       open my $fh, '+>', $f or die "open($f): $!";
+       my $pc = which($ENV{PKG_CONFIG} // 'pkg-config') //
+               die "pkg-config missing for libgit2";
        my ($dir) = (__FILE__ =~ m!\A(.+?)/[^/]+\z!);
        my $rdr = {};
        open $rdr->{2}, '>', '/dev/null' or die "open /dev/null: $!";
@@ -35,27 +37,40 @@ BEGIN {
                if (open(my $fh, '<', $f)) {
                        chomp($l, $c);
                        local $/;
-                       defined($c_src = <$fh>) or die "read $f: $!\n";
+                       defined($c_src = <$fh>) or die "read $f: $!";
                        $CFG{LIBS} = $l;
                        $CFG{CCFLAGSEX} = $c;
                        last;
                } else {
-                       die "E: $f: $!\n";
+                       die "E: $f: $!";
                }
        }
        die "E: libgit2 not installed\n" unless $c_src;
 
+       open my $oldout, '>&', \*STDOUT or die "dup(1): $!";
+       open my $olderr, '>&', \*STDERR or die "dup(2): $!";
+       open STDOUT, '>&', $fh or die "1>$f: $!";
+       open STDERR, '>&', $fh or die "2>$f: $!";
+       STDERR->autoflush(1);
+       STDOUT->autoflush(1);
+
        # CentOS 7.x ships Inline 0.53, 0.64+ has built-in locking
-       flock($lockfh, LOCK_EX) or die "LOCK_EX failed on $f: $!\n";
+       flock($fh, LOCK_EX) or die "LOCK_EX($f): $!\n";
+       # we use Capitalized and ALLCAPS for compatibility with old Inline::C
+       eval <<'EOM';
+use Inline C => Config => %CFG, BOOT => q[git_libgit2_init();];
+use Inline C => $c_src, BUILD_NOISY => 1;
+EOM
+       my $err = $@;
+       open(STDERR, '>&', $olderr) or warn "restore stderr: $!";
+       open(STDOUT, '>&', $oldout) or warn "restore stdout: $!";
+       if ($err) {
+               seek($fh, 0, SEEK_SET);
+               my @msg = <$fh>;
+               die "Inline::C Gcf2 build failed:\n", $err, "\n", @msg;
+       }
 }
 
-# we use Capitalized and ALLCAPS for compatibility with old Inline::C
-use Inline C => Config => %CFG, BOOT => 'git_libgit2_init();';
-use Inline C => $c_src;
-undef $c_src;
-undef %CFG;
-undef $lockfh;
-
 sub add_alt ($$) {
        my ($gcf2, $objdir) = @_;
 
@@ -73,11 +88,12 @@ sub add_alt ($$) {
                $gcf2->add_alternate($_) for @abs_alt;
        }
        $gcf2->add_alternate($objdir);
+       1;
 }
 
-# Usage: $^X -MPublicInbox::Gcf2 -e 'PublicInbox::Gcf2::loop()'
+# Usage: $^X -MPublicInbox::Gcf2 -e PublicInbox::Gcf2::loop
 # (see lib/PublicInbox/Gcf2Client.pm)
-sub loop {
+sub loop () {
        my $gcf2 = new();
        my %seen;
        STDERR->autoflush(1);
@@ -86,7 +102,7 @@ sub loop {
        while (<STDIN>) {
                chomp;
                my ($oid, $git_dir) = split(/ /, $_, 2);
-               $seen{$git_dir}++ or add_alt($gcf2, "$git_dir/objects");
+               $seen{$git_dir} //= add_alt($gcf2, "$git_dir/objects");
                if (!$gcf2->cat_oid(1, $oid)) {
                        # retry once if missing.  We only get unabbreviated OIDs
                        # from SQLite or Xapian DBs, here, so malicious clients
@@ -94,8 +110,7 @@ sub loop {
                        warn "I: $$ $oid missing, retrying in $git_dir\n";
 
                        $gcf2 = new();
-                       %seen = ($git_dir => 1);
-                       add_alt($gcf2, "$git_dir/objects");
+                       %seen = ($git_dir => add_alt($gcf2,"$git_dir/objects"));
 
                        if ($gcf2->cat_oid(1, $oid)) {
                                warn "I: $$ $oid found after retry\n";