Making t/14gzopen.t a bit more robust.

Subject: [PATCH] Compress::Zlib
From: "Paul Marquess" <Paul.Marquess@ntlworld.com>
Message-ID: <012101c5cd86$f895b640$291c140a@myopwv.com>

p4raw-id: //depot/perl@25727

diff --git a/ext/Compress/Zlib/Makefile.PL b/ext/Compress/Zlib/Makefile.PL
index 3c45fb0..aeb58e8 100755 (executable)
--- a/ext/Compress/Zlib/Makefile.PL
+++ b/ext/Compress/Zlib/Makefile.PL
@@ -28,9 +28,8 @@ my $GZIP_OS_CODE = -1 ;
 #$WALL = ' -pedantic ' if $Config{'cc'} =~ /gcc/ ;
 $WALL = ' -Wall ' if $Config{'cc'} =~ /gcc/ ;
 
-my $PERL_CORE = grep { $_ eq 'PERL_CORE=1' } @ARGV;
 # don't ask if MM_USE_DEFAULT is set -- enables perl core building on cygwin
-if ($^O =~ /cygwin/i and not ($ENV{PERL_MM_USE_DEFAULT} || $PERL_CORE))
+if ($^O =~ /cygwin/i and not $ENV{PERL_MM_USE_DEFAULT})
 {
     print <<EOM ;
 
@@ -74,6 +73,7 @@ my @files = ('Zlib.pm', 't/ZlibTestUtils.pm',
              glob("lib/File/*.pm"),
              grep(!/\.bak$/,  glob("examples/*"))) ;
 
+my $PERL_CORE = grep { $_ eq 'PERL_CORE=1' } @ARGV;
 UpDowngrade(@files) unless $PERL_CORE;
 
 WriteMakefile( 

diff --git a/ext/Compress/Zlib/Zlib.xs b/ext/Compress/Zlib/Zlib.xs
index 19b5b6b..5d64890 100644 (file)
--- a/ext/Compress/Zlib/Zlib.xs
+++ b/ext/Compress/Zlib/Zlib.xs
@@ -996,8 +996,8 @@ deflate (s, buf, output)
     if (DO_UTF8(buf) && !sv_utf8_downgrade(buf, 1))
          croak("Wide character in Compress::Zlib::Deflate::deflate input parameter");
 #endif         
-    s->stream.next_in = (Bytef*)SvPVbyte_nolen(buf) ;
-    s->stream.avail_in = SvCUR(buf) ; 
+    s->stream.next_in = (Bytef*)SvPVbyte(buf, *(STRLEN*)&s->stream.avail_in) ;
+    /* s->stream.avail_in = SvCUR(buf) ; */
     
     if (s->flags & FLAG_CRC32)
         s->crc32 = crc32(s->crc32, s->stream.next_in, s->stream.avail_in) ;
@@ -1346,7 +1346,6 @@ inflate (s, buf, output)
     uInt       cur_length = NO_INIT
     uInt       prefix_length = NO_INIT
     uInt       increment = NO_INIT
-    STRLEN  stmp   = NO_INIT
   PREINIT:
 #ifdef UTF8_AVAILABLE    
     bool       out_utf8  = FALSE;
@@ -1363,8 +1362,7 @@ inflate (s, buf, output)
 #endif         
     
     /* initialise the input buffer */
-    s->stream.next_in = (Bytef*)SvPVbyte_force(buf, stmp) ;
-    s->stream.avail_in = SvCUR(buf) ; 
+    s->stream.next_in = (Bytef*)SvPVbyte_force(buf, *(STRLEN*)&s->stream.avail_in) ;
        
     /* and retrieve the output buffer */
     output = deRef_l(output, "inflate") ;
@@ -1628,7 +1626,6 @@ scan(s, buf, out=NULL)
     SV *       buf
     SV *       out
     int    start_len = NO_INIT
-    STRLEN  stmp   = NO_INIT
   ALIAS:
     inflate = 1
   CODE:
@@ -1645,8 +1642,7 @@ scan(s, buf, out=NULL)
 #endif         
     
     /* initialise the input buffer */
-    s->stream.next_in = (Bytef*)SvPVbyte_force(buf, stmp) ;
-    s->stream.avail_in = SvCUR(buf) ; 
+    s->stream.next_in = (Bytef*)SvPVbyte_force(buf, *(STRLEN*)&s->stream.avail_in) ;
     start_len = s->stream.avail_in ;
     s->bytesInflated = 0 ; 
     do

diff --git a/ext/Compress/Zlib/t/14gzopen.t b/ext/Compress/Zlib/t/14gzopen.t
index 56683b4..5d8342b 100644 (file)
--- a/ext/Compress/Zlib/t/14gzopen.t
+++ b/ext/Compress/Zlib/t/14gzopen.t
@@ -24,8 +24,6 @@ BEGIN {
 
     use_ok('Compress::Zlib', 2) ;
     use_ok('Compress::Gzip::Constants') ;
-
-    use_ok('IO::Compress::Gzip', qw($GzipError)) ;
 }
 
 
@@ -180,13 +178,13 @@ my $line = '';
 for my $i (0 .. @text -2)
 {
     ok $fil->gzreadline($line) > 0;
-    ok $line eq $text[$i] ;
+    is $line, $text[$i] ;
     ok ! $fil->gzeof() ;
 }
 
 # now read the last line
 ok $fil->gzreadline($line) > 0;
-ok $line eq $text[-1] ;
+is $line, $text[-1] ;
 ok $fil->gzeof() ;
 
 # read past the eof
@@ -214,9 +212,9 @@ while ($fil->gzreadline($line) > 0) {
     $got[$i] = $line ;    
     ++ $i ;
 }
-ok $i == 2 ;
-ok $got[0] eq $line1 ;
-ok $got[1] eq $line2 ;
+is $i, 2 ;
+is $got[0], $line1 ;
+is $got[1], $line2 ;
 
 ok   $fil->gzeof() ;
 ok ! $fil->gzclose ;
@@ -241,9 +239,9 @@ while ($fil->gzreadline($line) > 0) {
     $got[$i] = $line ;    
     ++ $i ;
 }
-ok $i == 2 ;
-ok $got[0] eq $line1 ;
-ok $got[1] eq $line2 ;
+is $i, 2 ;
+is $got[0], $line1 ;
+is $got[1], $line2 ;
 
 ok   $fil->gzeof() ;
 ok ! $fil->gzclose ;
@@ -257,13 +255,13 @@ unlink $name ;
     # case 1: read a line, then a block. The block is
     #         smaller than the internal block used by
     #    gzreadline
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
     $line1 = "hello hello, I'm back again\n" ;
     $line2 = "abc" x 200 ; 
     my $line3 = "def" x 200 ;
     
     $text = $line1 . $line2 . $line3 ;
+    my $fil;
     ok $fil = gzopen($name, "wb"), ' gzopen for write ok' ;
     is $fil->gzwrite($text), length $text, '    gzwrite ok' ;
     is $fil->gztell(), length $text, '    gztell ok' ;
@@ -290,8 +288,7 @@ unlink $name ;
 {
     title "Pass gzopen a filehandle - use IO::File" ;
 
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
 
     my $hello = "hello" ;
     my $len = length $hello ;
@@ -301,7 +298,8 @@ unlink $name ;
     my $f = new IO::File ">$name" ;
     ok $f;
 
-    ok my $fil = gzopen($f, "wb") ;
+    my $fil;
+    ok $fil = gzopen($f, "wb") ;
 
     ok $fil->gzwrite($hello) == $len ;
 
@@ -320,7 +318,7 @@ unlink $name ;
 
     unlink $name ;
 
-    ok $hello eq $uncomp ;
+    is $uncomp, $hello, "got expected output" ;
 
 
 }
@@ -329,8 +327,7 @@ unlink $name ;
 {
     title "Pass gzopen a filehandle - use open" ;
 
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
 
     my $hello = "hello" ;
     my $len = length $hello ;
@@ -339,7 +336,8 @@ unlink $name ;
 
     open F, ">$name" ;
 
-    ok my $fil = gzopen(*F, "wb") ;
+    my $fil;
+    ok $fil = gzopen(*F, "wb") ;
 
     is $fil->gzwrite($hello), $len ;
 
@@ -358,7 +356,7 @@ unlink $name ;
 
     unlink $name ;
 
-    ok $hello eq $uncomp ;
+    is $uncomp, $hello ;
 
 
 }
@@ -370,8 +368,7 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT])
 
     title "Pass gzopen a filehandle - use $stdin" ;
 
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
 
     my $hello = "hello" ;
     my $len = length $hello ;
@@ -412,15 +409,14 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT])
 
     unlink $name ;
 
-    ok $hello eq $uncomp ;
+    is $uncomp, $hello ;
 
 
 }
 
 {
     title 'test parameters for gzopen';
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
 
     my $fil;
 
@@ -451,19 +447,20 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT])
 {
     title 'Read operations when opened for writing';
 
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
+    my $fil;
     ok $fil = gzopen($name, "wb"), '  gzopen for writing' ;
     ok !$fil->gzeof(), '    !eof'; ;
     is $fil->gzread(), Z_STREAM_ERROR, "    gzread returns Z_STREAM_ERROR" ;
+    ok ! $fil->gzclose, "  gzclose ok" ;
 }
 
 {
     title 'write operations when opened for reading';
 
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
     my $test = "hello" ;
+    my $fil;
     ok $fil = gzopen($name, "wb"), "  gzopen for writing" ;
     is $fil->gzwrite($text), length $text, "    gzwrite ok" ;
     ok ! $fil->gzclose, "  gzclose ok" ;
@@ -519,7 +516,7 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT])
     title "gzseek" ;
 
     my $buff ;
-    my $name ;#= "test.gz" ;
+    my $name ;
     my $lex = new LexFile $name ;
 
     my $first = "beginning" ;
@@ -564,8 +561,7 @@ foreach my $stdio ( ['-', '-'], [*STDIN, *STDOUT])
 
 {
     # seek error cases
-    my $name = "test.gz" ;
-    my $lex = new LexFile $name ;
+    my $lex = new LexFile my $name ;
 
     my $a = gzopen($name, "w");