git: remove POSIX::dup2 import

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index f3b7a0a0ef80f2437931ba4b464638f2f1aff060..9c96b3f0b6920acbcfd4a103e3ec14a7ec8618b6 100644 (file)
--- 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,9 +9,10 @@
 package PublicInbox::Git;
 use strict;
 use warnings;
-use POSIX qw(dup2);
+use POSIX ();
 use IO::Handle; # ->autoflush
-use PublicInbox::Spawn qw(spawn popen_rd);
+use File::Glob qw(bsd_glob GLOB_NOSORT);
+use PublicInbox::Spawn qw(popen_rd);
 use PublicInbox::Tmpfile;
 use base qw(Exporter);
 our @EXPORT_OK = qw(git_unquote git_quote);
@@ -103,28 +104,24 @@ sub _bidi_pipe {
                }
                return;
        }
-       my ($in_r, $in_w, $out_r, $out_w);
-
-       pipe($in_r, $in_w) or fail($self, "pipe failed: $!");
+       my ($out_r, $out_w);
        pipe($out_r, $out_w) or fail($self, "pipe failed: $!");
-       if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
-               fcntl($out_w, 1031, 4096);
-               fcntl($in_w, 1031, 4096) if $batch eq '--batch-check';
-       }
-
        my @cmd = (qw(git), "--git-dir=$self->{git_dir}",
                        qw(-c core.abbrev=40 cat-file), $batch);
-       my $redir = { 0 => $out_r, 1 => $in_w };
+       my $redir = { 0 => $out_r };
        if ($err) {
                my $id = "git.$self->{git_dir}$batch.err";
                my $fh = tmpfile($id) or fail($self, "tmpfile($id): $!");
                $self->{$err} = $fh;
                $redir->{2} = $fh;
        }
-       my $p = spawn(\@cmd, undef, $redir);
-       defined $p or fail($self, "spawn failed: $!");
+       my ($in_r, $p) = popen_rd(\@cmd, undef, $redir);
        $self->{$pid} = $p;
        $out_w->autoflush(1);
+       if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
+               fcntl($out_w, 1031, 4096);
+               fcntl($in_r, 1031, 4096) if $batch eq '--batch-check';
+       }
        $self->{$out} = $out_w;
        $self->{$in} = $in_r;
 }
@@ -256,7 +253,6 @@ sub popen {
 sub qx {
        my ($self, @cmd) = @_;
        my $fh = $self->popen(@cmd);
-       defined $fh or return;
        local $/ = "\n";
        return <$fh> if wantarray;
        local $/;
@@ -278,7 +274,7 @@ sub packed_bytes {
        my ($self) = @_;
        my $n = 0;
        my $pack_dir = git_path($self, 'objects/pack');
-       foreach my $p (glob("$pack_dir/*.pack")) {
+       foreach my $p (bsd_glob("$pack_dir/*.pack", GLOB_NOSORT)) {
                $n += -s $p;
        }
        $n
@@ -347,10 +343,9 @@ sub modified ($) {
        my ($self) = @_;
        my $modified = 0;
        my $fh = popen($self, qw(rev-parse --branches));
-       defined $fh or return $modified;
        cat_async_begin($self);
        local $/ = "\n";
-       foreach my $oid (<$fh>) {
+       while (my $oid = <$fh>) {
                chomp $oid;
                cat_async($self, $oid, \&extract_cmt_time, \$modified);
        }