[PATCH v5 02/40] t0021/rot13-filter: refactor packet reading functions
From: Christian Couder <hidden>
Date: 2017-08-03 09:22:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
To make it possible in a following commit to move packet reading and writing functions into a Packet.pm module, let's refactor these functions, so they don't handle printing debug output and exiting. Signed-off-by: Christian Couder <redacted> --- t/t0021/rot13-filter.pl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index 617f581e56..d6411ca523 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl@@ -39,8 +39,7 @@ sub packet_bin_read { my $bytes_read = read STDIN, $buffer, 4; if ( $bytes_read == 0 ) { # EOF - Git stopped talking to us! - print $debug "STOP\n"; - exit(); + return ( -1, "" ); } elsif ( $bytes_read != 4 ) { die "invalid packet: '$buffer'";
@@ -64,7 +63,7 @@ sub packet_bin_read { sub packet_txt_read { my ( $res, $buf ) = packet_bin_read(); - unless ( $buf =~ s/\n$// ) { + unless ( $res == -1 || $buf =~ s/\n$// ) { die "A non-binary line MUST be terminated by an LF."; } return ( $res, $buf );
@@ -109,7 +108,12 @@ print $debug "init handshake complete\n"; $debug->flush(); while (1) { - my ($command) = packet_txt_read() =~ /^command=(.+)$/; + my ($res, $command) = packet_txt_read(); + if ( $res == -1 ) { + print $debug "STOP\n"; + exit(); + } + $command =~ s/^command=//; print $debug "IN: $command"; $debug->flush();
--
2.14.0.rc1.52.gf02fb0ddac.dirty