lei rediff: use ProcessIO for --drq support

This required fixing binmode support a few commits ago, along
with properly enabling autoflush in popen_wr instead of setting
it on the wrapper ProcessIO class.

diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm
index b894342be8d83bd9dd2e56757b99a44cc96b6888..230f3e83e9ec9509aa5a9b13a4acb05427ef69b6 100644 (file)
--- a/lib/PublicInbox/LeiRediff.pm
+++ b/lib/PublicInbox/LeiRediff.pm
@@ -138,35 +138,30 @@ EOM
        undef;
 }
 
-sub wait_requote { # OnDestroy callback
-       my ($lei, $pid, $old_1) = @_;
-       $lei->{1} = $old_1; # closes stdin of `perl -pe 's/^/> /'`
-       waitpid($pid, 0) == $pid or die "BUG(?) waitpid: \$!=$! \$?=$?";
-       $lei->child_error($?) if $?;
-}
+# awaitpid callback
+sub wait_requote { $_[1]->child_error($?) if $? }
 
-sub requote ($$) {
+sub requote ($$) { # '> ' prefix(es) lei->{1}
        my ($lei, $pfx) = @_;
-       my $old_1 = $lei->{1};
-       my $opt = { 1 => $old_1, 2 => $lei->{2} };
+       my $opt = { 1 => $lei->{1}, 2 => $lei->{2} };
        # $^X (perl) is overkill, but maybe there's a weird system w/o sed
-       my ($w, $pid) = popen_wr([$^X, '-pe', "s/^/$pfx/"], $lei->{env}, $opt);
-       $w->autoflush(1);
-       binmode $w, ':utf8'; # incompatible with ProcessIO due to syswrite
-       $lei->{1} = $w;
-       PublicInbox::OnDestroy->new(\&wait_requote, $lei, $pid, $old_1);
+       my $w = popen_wr([$^X, '-pe', "s/^/$pfx/"], $lei->{env}, $opt,
+                        \&wait_requote, $lei);
+       binmode $w, ':utf8';
+       $w;
 }
 
 sub extract_oids { # Eml each_part callback
        my ($ary, $self) = @_;
+       my $lei = $self->{lei};
        my ($p, undef, $idx) = @$ary;
-       $self->{lei}->out($p->header_obj->as_string, "\n");
+       $lei->out($p->header_obj->as_string, "\n");
        my ($s, undef) = msg_part_text($p, $p->content_type || 'text/plain');
        defined $s or return;
-       my $rq;
-       if ($self->{dqre} && $s =~ s/$self->{dqre}//g) { # '> ' prefix(es)
-               $rq = requote($self->{lei}, $1) if $self->{lei}->{opt}->{drq};
-       }
+
+       $self->{dqre} && $s =~ s/$self->{dqre}//g && $lei->{opt}->{drq} and
+               local $lei->{1} = requote($lei, $1);
+
        my @top = split($PublicInbox::ViewDiff::EXTRACT_DIFFS, $s);
        undef $s;
        my $blobs = $self->{blobs}; # blobs to resolve

diff --git a/lib/PublicInbox/ProcessIO.pm b/lib/PublicInbox/ProcessIO.pm
index f120edd0179d71ba53c68d1ea15cc0f7e5f79279..ea5d3e6cddc507abb881bfabe6aa3ba13a3002ab 100644 (file)
--- a/lib/PublicInbox/ProcessIO.pm
+++ b/lib/PublicInbox/ProcessIO.pm
@@ -7,6 +7,7 @@ package PublicInbox::ProcessIO;
 use v5.12;
 use PublicInbox::DS qw(awaitpid);
 use Symbol qw(gensym);
+use bytes qw(length);
 
 sub maybe_new {
        my ($cls, $pid, $fh, @cb_arg) = @_;
@@ -31,25 +32,16 @@ sub TIEHANDLE {
        $self;
 }
 
-# for IO::Uncompress::Gunzip
-sub BINMODE {
-       return binmode($_[0]->{fh}) if @_ == 1;
-       binmode $_[0]->{fh}, $_[1];
-}
+# for IO::Uncompress::Gunzip and PublicInbox::LeiRediff
+sub BINMODE { @_ == 1 ? binmode($_[0]->{fh}) : binmode($_[0]->{fh}, $_[1]) }
 
 sub READ { read($_[0]->{fh}, $_[1], $_[2], $_[3] || 0) }
 
 sub READLINE { readline($_[0]->{fh}) }
 
-sub WRITE {
-       use bytes qw(length);
-       syswrite($_[0]->{fh}, $_[1], $_[2] // length($_[1]), $_[3] // 0);
-}
+sub WRITE { syswrite($_[0]->{fh}, $_[1], $_[2] // length($_[1]), $_[3] // 0) }
 
-sub PRINT {
-       my $self = shift;
-       print { $self->{fh} } @_;
-}
+sub PRINT { print { $_[0]->{fh} } @_[1..$#_] }
 
 sub FILENO { fileno($_[0]->{fh}) }
 

diff --git a/lib/PublicInbox/Spawn.pm b/lib/PublicInbox/Spawn.pm
index 265638fe6c58f491077818510b1eb63909878c25..106f5e01313e358c44ed54623e46f3221f2dcfe2 100644 (file)
--- a/lib/PublicInbox/Spawn.pm
+++ b/lib/PublicInbox/Spawn.pm
@@ -376,6 +376,7 @@ sub popen_rd {
 sub popen_wr {
        my ($cmd, $env, $opt, @cb_arg) = @_;
        pipe(local $opt->{0}, my $w) or die "pipe: $!\n";
+       $w->autoflush(1);
        my $pid = spawn($cmd, $env, $opt);
        PublicInbox::ProcessIO->maybe_new($pid, $w, @cb_arg)
 }