From aba24c12b87acfe2766d6e9435b4c80de70ad5ba Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 25 Sep 2015 02:27:55 +0000 Subject: [PATCH] git: signal-safety for pipe writes I've yet to hit it, but syswrite has chance of returning EINTR on a blocking pipe. --- lib/PublicInbox/GitCatFile.pm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/PublicInbox/GitCatFile.pm b/lib/PublicInbox/GitCatFile.pm index 48ae6734..3fced28d 100644 --- a/lib/PublicInbox/GitCatFile.pm +++ b/lib/PublicInbox/GitCatFile.pm @@ -7,6 +7,7 @@ package PublicInbox::GitCatFile; use strict; use warnings; use POSIX qw(dup2); +require IO::Handle; sub new { my ($class, $git_dir) = @_; @@ -31,6 +32,7 @@ sub _cat_file_begin { } close $out_r or die "close failed: $!\n"; close $in_w or die "close failed: $!\n"; + $out_w->autoflush(1); $self->{in} = $in_r; $self->{out} = $out_w; @@ -40,16 +42,8 @@ sub _cat_file_begin { sub cat_file { my ($self, $object, $sizeref) = @_; - $object .= "\n"; - my $len = length($object); - $self->_cat_file_begin; - my $written = syswrite($self->{out}, $object); - if (!defined $written) { - die "pipe write error: $!\n"; - } elsif ($written != $len) { - die "wrote too little to pipe ($written < $len)\n"; - } + print { $self->{out} } $object, "\n" or die "pipe write error: $!\n"; my $in = $self->{in}; my $head = <$in>; -- 2.44.0