And while at it let's simplify t0021/rot13-filter.pl by
using Git/Packet.pm.

This will make it possible to reuse packet related
functions in other test scripts.

Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
 perl/Git/Packet.pm      | 118 ++++++++++++++++++++++++++++++++++++++++++++++++
 t/t0021/rot13-filter.pl |  94 ++------------------------------------
 2 files changed, 121 insertions(+), 91 deletions(-)
 create mode 100644 perl/Git/Packet.pm

diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm
new file mode 100644
index 0000000000..b1e67477a0
--- /dev/null
+++ b/perl/Git/Packet.pm
@@ -0,0 +1,118 @@
+package Git::Packet;
+use 5.008;
+use strict;
+use warnings;
+BEGIN {
+       require Exporter;
+       if ($] < 5.008003) {
+               *import = \&Exporter::import;
+       } else {
+               # Exporter 5.57 which supports this invocation was
+               # released with perl 5.8.3
+               Exporter->import('import');
+       }
+}
+
+our @EXPORT = qw(
+                       packet_bin_read
+                       packet_txt_read
+                       packet_bin_write
+                       packet_txt_write
+                       packet_flush
+                       packet_initialize
+                       packet_read_capabilities
+                       packet_write_capabilities
+                       packet_read_and_check_capabilities
+               );
+our @EXPORT_OK = @EXPORT;
+
+sub packet_bin_read {
+       my $buffer;
+       my $bytes_read = read STDIN, $buffer, 4;
+       if ( $bytes_read == 0 ) {
+               # EOF - Git stopped talking to us!
+               return ( -1, "" );
+       } elsif ( $bytes_read != 4 ) {
+               die "invalid packet: '$buffer'";
+       }
+       my $pkt_size = hex($buffer);
+       if ( $pkt_size == 0 ) {
+               return ( 1, "" );
+       } elsif ( $pkt_size > 4 ) {
+               my $content_size = $pkt_size - 4;
+               $bytes_read = read STDIN, $buffer, $content_size;
+               if ( $bytes_read != $content_size ) {
+                       die "invalid packet ($content_size bytes expected; 
$bytes_read bytes read)";
+               }
+               return ( 0, $buffer );
+       } else {
+               die "invalid packet size: $pkt_size";
+       }
+}
+
+sub packet_txt_read {
+       my ( $res, $buf ) = packet_bin_read();
+       unless ( $res == -1 or $buf eq '' or $buf =~ s/\n$// ) {
+               die "A non-binary line MUST be terminated by an LF.\n"
+                   . "Received: '$buf'";
+       }
+       return ( $res, $buf );
+}
+
+sub packet_bin_write {
+       my $buf = shift;
+       print STDOUT sprintf( "%04x", length($buf) + 4 );
+       print STDOUT $buf;
+       STDOUT->flush();
+}
+
+sub packet_txt_write {
+       packet_bin_write( $_[0] . "\n" );
+}
+
+sub packet_flush {
+       print STDOUT sprintf( "%04x", 0 );
+       STDOUT->flush();
+}
+
+sub packet_initialize {
+       my ($name, $version) = @_;
+
+       ( packet_txt_read() eq ( 0, $name . "-client" ) )       || die "bad 
initialize";
+       ( packet_txt_read() eq ( 0, "version=" . $version ) )   || die "bad 
version";
+       ( packet_bin_read() eq ( 1, "" ) )                      || die "bad 
version end";
+
+       packet_txt_write( $name . "-server" );
+       packet_txt_write( "version=" . $version );
+       packet_flush();
+}
+
+sub packet_read_capabilities {
+       my @cap;
+       while (1) {
+               my ( $res, $buf ) = packet_bin_read();
+               return ( $res, @cap ) if ( $res != 0 );
+               unless ( $buf =~ s/\n$// ) {
+                       die "A non-binary line MUST be terminated by an LF.\n"
+                           . "Received: '$buf'";
+               }
+               die "bad capability buf: '$buf'" unless ( $buf =~ 
s/capability=// );
+               push @cap, $buf;
+       }
+}
+
+sub packet_read_and_check_capabilities {
+       my @local_caps = @_;
+       my @remote_res_caps = packet_read_capabilities();
+       my $res = shift @remote_res_caps;
+       my %remote_caps = map { $_ => 1 } @remote_res_caps;
+       foreach (@local_caps) {
+               die "'$_' capability not available" unless 
(exists($remote_caps{$_}));
+       }
+       return $res;
+}
+
+sub packet_write_capabilities {
+       packet_txt_write( "capability=" . $_ ) foreach (@_);
+       packet_flush();
+}
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index ba18b207c6..2e8ad4d496 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -30,9 +30,12 @@
 #     to the "list_available_blobs" response.
 #
 
+use 5.008;
+use lib (split(/:/, $ENV{GITPERLLIB}));
 use strict;
 use warnings;
 use IO::File;
+use Git::Packet;
 
 my $MAX_PACKET_CONTENT_SIZE = 65516;
 my $log_file                = shift @ARGV;
@@ -55,97 +58,6 @@ sub rot13 {
        return $str;
 }
 
-sub packet_bin_read {
-       my $buffer;
-       my $bytes_read = read STDIN, $buffer, 4;
-       if ( $bytes_read == 0 ) {
-               # EOF - Git stopped talking to us!
-               return ( -1, "" );
-       } elsif ( $bytes_read != 4 ) {
-               die "invalid packet: '$buffer'";
-       }
-       my $pkt_size = hex($buffer);
-       if ( $pkt_size == 0 ) {
-               return ( 1, "" );
-       } elsif ( $pkt_size > 4 ) {
-               my $content_size = $pkt_size - 4;
-               $bytes_read = read STDIN, $buffer, $content_size;
-               if ( $bytes_read != $content_size ) {
-                       die "invalid packet ($content_size bytes expected; 
$bytes_read bytes read)";
-               }
-               return ( 0, $buffer );
-       } else {
-               die "invalid packet size: $pkt_size";
-       }
-}
-
-sub packet_txt_read {
-       my ( $res, $buf ) = packet_bin_read();
-       unless ( $res == -1 or $buf eq '' or $buf =~ s/\n$// ) {
-               die "A non-binary line MUST be terminated by an LF.\n"
-                   . "Received: '$buf'";
-       }
-       return ( $res, $buf );
-}
-
-sub packet_bin_write {
-       my $buf = shift;
-       print STDOUT sprintf( "%04x", length($buf) + 4 );
-       print STDOUT $buf;
-       STDOUT->flush();
-}
-
-sub packet_txt_write {
-       packet_bin_write( $_[0] . "\n" );
-}
-
-sub packet_flush {
-       print STDOUT sprintf( "%04x", 0 );
-       STDOUT->flush();
-}
-
-sub packet_initialize {
-       my ($name, $version) = @_;
-
-       ( packet_txt_read() eq ( 0, $name . "-client" ) )       || die "bad 
initialize";
-       ( packet_txt_read() eq ( 0, "version=" . $version ) )   || die "bad 
version";
-       ( packet_bin_read() eq ( 1, "" ) )                      || die "bad 
version end";
-
-       packet_txt_write( $name . "-server" );
-       packet_txt_write( "version=" . $version );
-       packet_flush();
-}
-
-sub packet_read_capabilities {
-       my @cap;
-       while (1) {
-               my ( $res, $buf ) = packet_bin_read();
-               return ( $res, @cap ) if ( $res != 0 );
-               unless ( $buf =~ s/\n$// ) {
-                       die "A non-binary line MUST be terminated by an LF.\n"
-                           . "Received: '$buf'";
-               }
-               die "bad capability buf: '$buf'" unless ( $buf =~ 
s/capability=// );
-               push @cap, $buf;
-       }
-}
-
-sub packet_read_and_check_capabilities {
-       my @local_caps = @_;
-       my @remote_res_caps = packet_read_capabilities();
-       my $res = shift @remote_res_caps;
-       my %remote_caps = map { $_ => 1 } @remote_res_caps;
-       foreach (@local_caps) {
-               die "'$_' capability not available" unless 
(exists($remote_caps{$_}));
-       }
-       return $res;
-}
-
-sub packet_write_capabilities {
-       packet_txt_write( "capability=" . $_ ) foreach (@_);
-       packet_flush();
-}
-
 print $debug "START\n";
 $debug->flush();
 
-- 
2.14.1.576.g3f707d88cd

Reply via email to