In perl.git, the branch blead has been updated <http://perl5.git.perl.org/perl.git/commitdiff/dcfdccf94c5ada3342776b740fd487168bef3ca3?hp=813720522fb5f54e39efcf9e4103d762ad005f51>
- Log ----------------------------------------------------------------- commit dcfdccf94c5ada3342776b740fd487168bef3ca3 Author: Paul Marquess <[email protected]> Date: Fri Jun 5 19:42:38 2009 -0500 [PATCH] *-Compress-* 2.020 ----------------------------------------------------------------------- Summary of changes: ext/Compress-Raw-Bzip2/Bzip2.xs | 4 +- ext/Compress-Raw-Bzip2/Changes | 4 ++ ext/Compress-Raw-Bzip2/README | 6 ++-- ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm | 2 +- ext/Compress-Raw-Bzip2/t/000prereq.t | 2 +- ext/Compress-Raw-Zlib/Changes | 4 ++ ext/Compress-Raw-Zlib/README | 6 ++-- ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm | 11 +++---- ext/IO-Compress/Changes | 9 ++++++ ext/IO-Compress/Makefile.PL | 2 +- ext/IO-Compress/README | 6 ++-- ext/IO-Compress/lib/Compress/Zlib.pm | 12 ++++---- ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm | 6 ++-- ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm | 6 ++-- .../lib/IO/Compress/Adapter/Identity.pm | 4 +- ext/IO-Compress/lib/IO/Compress/Base.pm | 4 +- ext/IO-Compress/lib/IO/Compress/Base/Common.pm | 2 +- ext/IO-Compress/lib/IO/Compress/Bzip2.pm | 10 +++--- ext/IO-Compress/lib/IO/Compress/Deflate.pm | 10 +++--- ext/IO-Compress/lib/IO/Compress/Gzip.pm | 12 ++++---- ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm | 2 +- ext/IO-Compress/lib/IO/Compress/RawDeflate.pm | 12 ++++---- ext/IO-Compress/lib/IO/Compress/Zip.pm | 24 ++++++++-------- ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm | 2 +- ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm | 2 +- ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm | 4 +- .../lib/IO/Uncompress/Adapter/Bunzip2.pm | 15 +++++---- .../lib/IO/Uncompress/Adapter/Identity.pm | 9 ++++-- .../lib/IO/Uncompress/Adapter/Inflate.pm | 7 ++-- ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm | 18 ++++++------ ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm | 30 ++++++++++---------- ext/IO-Compress/lib/IO/Uncompress/Base.pm | 10 ++---- ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm | 10 +++--- ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm | 14 ++++---- ext/IO-Compress/lib/IO/Uncompress/Inflate.pm | 8 ++-- ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm | 10 +++--- ext/IO-Compress/lib/IO/Uncompress/Unzip.pm | 18 ++++++------ ext/IO-Compress/t/000prereq.t | 2 +- 38 files changed, 169 insertions(+), 150 deletions(-) diff --git a/ext/Compress-Raw-Bzip2/Bzip2.xs b/ext/Compress-Raw-Bzip2/Bzip2.xs index 36b2dbe..c343e8a 100644 --- a/ext/Compress-Raw-Bzip2/Bzip2.xs +++ b/ext/Compress-Raw-Bzip2/Bzip2.xs @@ -796,10 +796,10 @@ bzinflate (s, buf, output) bufinc *= 2 ; } - /*DispStream(s, "pre"); */ + /* DispStream(s, "pre"); */ RETVAL = BZ2_bzDecompress (&(s->stream)); - /*DispStream(s, "apres");*/ + /* DispStream(s, "apres"); */ if (RETVAL != BZ_OK || s->flags & FLAG_LIMIT_OUTPUT) break ; diff --git a/ext/Compress-Raw-Bzip2/Changes b/ext/Compress-Raw-Bzip2/Changes index f8c7a64..798e1ac 100644 --- a/ext/Compress-Raw-Bzip2/Changes +++ b/ext/Compress-Raw-Bzip2/Changes @@ -1,6 +1,10 @@ CHANGES ------- + 2.020 4 June 2009 + + * No Changes + 2.019 4 May 2009 * tidied up Bzip2.xs diff --git a/ext/Compress-Raw-Bzip2/README b/ext/Compress-Raw-Bzip2/README index 7f6bcb7..c96ce46 100644 --- a/ext/Compress-Raw-Bzip2/README +++ b/ext/Compress-Raw-Bzip2/README @@ -1,9 +1,9 @@ Compress-Raw-Bzip2 - Version 2.019 + Version 2.020 - 4th May 2009 + 3rd June 2009 Copyright (c) 2005-2009 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -164,7 +164,7 @@ To help me help you, I need all of the following information: If you haven't installed Compress-Raw-Bzip2 then search Compress::Raw::Bzip2.pm for a line like this: - $VERSION = "2.019" ; + $VERSION = "2.020" ; c. The version of bzip2 you have used. If you have successfully installed Compress-Raw-Bzip2, this one-liner diff --git a/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm b/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm index 0c5d8bc..6b72532 100644 --- a/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm +++ b/ext/Compress-Raw-Bzip2/lib/Compress/Raw/Bzip2.pm @@ -12,7 +12,7 @@ use Carp ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.019'; +$VERSION = '2.020'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/ext/Compress-Raw-Bzip2/t/000prereq.t b/ext/Compress-Raw-Bzip2/t/000prereq.t index fd131fc..2fb29f3 100644 --- a/ext/Compress-Raw-Bzip2/t/000prereq.t +++ b/ext/Compress-Raw-Bzip2/t/000prereq.t @@ -19,7 +19,7 @@ BEGIN if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - my $VERSION = '2.019'; + my $VERSION = '2.020'; my @NAMES = qw( ); diff --git a/ext/Compress-Raw-Zlib/Changes b/ext/Compress-Raw-Zlib/Changes index 3308181..3fabb3d 100644 --- a/ext/Compress-Raw-Zlib/Changes +++ b/ext/Compress-Raw-Zlib/Changes @@ -1,6 +1,10 @@ CHANGES ------- + 2.020 3 June 2009 + + * Minor documentation update. + 2.019 4 May 2009 * No Changes diff --git a/ext/Compress-Raw-Zlib/README b/ext/Compress-Raw-Zlib/README index 3248f94..5568c5d 100644 --- a/ext/Compress-Raw-Zlib/README +++ b/ext/Compress-Raw-Zlib/README @@ -1,9 +1,9 @@ Compress-Raw-Zlib - Version 2.019 + Version 2.020 - 4th May 2009 + 3rd June 2009 Copyright (c) 2005-2009 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -355,7 +355,7 @@ To help me help you, I need all of the following information: If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm for a line like this: - $VERSION = "2.019" ; + $VERSION = "2.020" ; c. The version of zlib you have used. If you have successfully installed Compress-Raw-Zlib, this one-liner diff --git a/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm b/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm index f55ad46..25394f1 100644 --- a/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm +++ b/ext/Compress-Raw-Zlib/lib/Compress/Raw/Zlib.pm @@ -13,7 +13,7 @@ use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.019'; +$VERSION = '2.020'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -1369,11 +1369,10 @@ C<$input>. =head1 ACCESSING ZIP FILES -Although it is possible (with some effort on your part) to use this -module to access .zip files, there is a module on CPAN that will do all -the hard work for you. Check out the C<Archive::Zip> module on CPAN at - - http://www.cpan.org/modules/by-module/Archive/Archive-Zip-*.tar.gz +Although it is possible (with some effort on your part) to use this module +to access .zip files, there are other perl modules available that will +do all the hard work for you. Check out C<Archive::Zip>, +C<IO::Compress::Zip> and C<IO::Uncompress::Unzip>. =head1 CONSTANTS diff --git a/ext/IO-Compress/Changes b/ext/IO-Compress/Changes index ae9ba36..8464740 100644 --- a/ext/IO-Compress/Changes +++ b/ext/IO-Compress/Changes @@ -1,6 +1,15 @@ CHANGES ------- + 2.020 3 June 2009 + + * IO::Uncompress::Base.pm + - Fixed problem with LimitOutput where a call to uncompress + created more uncompressed output, but didn't consume any of + the input buffer. The symptom is the underlying compression + library (zlib or bzip2) thinks the input stream is corrupt. + [RT #46582] + 2.019 4 May 2009 * IO::Uncompress::Adapter::Bunzip2 diff --git a/ext/IO-Compress/Makefile.PL b/ext/IO-Compress/Makefile.PL index 801c2a6..bab8f39 100644 --- a/ext/IO-Compress/Makefile.PL +++ b/ext/IO-Compress/Makefile.PL @@ -3,7 +3,7 @@ use strict ; require 5.004 ; -$::VERSION = '2.019' ; +$::VERSION = '2.020' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; diff --git a/ext/IO-Compress/README b/ext/IO-Compress/README index 4979787..4436fdf 100644 --- a/ext/IO-Compress/README +++ b/ext/IO-Compress/README @@ -1,9 +1,9 @@ IO-Compress - Version 2.019 + Version 2.020 - 4th May 2009 + 3rd June 2009 Copyright (c) 1995-2009 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -89,7 +89,7 @@ To help me help you, I need all of the following information: If you haven't installed IO-Compress then search IO::Compress::Gzip.pm for a line like this: - $VERSION = "2.019" ; + $VERSION = "2.020" ; 2. If you are having problems building IO-Compress, send me a complete log of what happened. Start by unpacking the IO-Compress diff --git a/ext/IO-Compress/lib/Compress/Zlib.pm b/ext/IO-Compress/lib/Compress/Zlib.pm index 142ff3d..c4137c4 100644 --- a/ext/IO-Compress/lib/Compress/Zlib.pm +++ b/ext/IO-Compress/lib/Compress/Zlib.pm @@ -8,17 +8,17 @@ use Carp ; use IO::Handle ; use Scalar::Util qw(dualvar); -use IO::Compress::Base::Common 2.019 ; -use Compress::Raw::Zlib 2.019 ; -use IO::Compress::Gzip 2.019 ; -use IO::Uncompress::Gunzip 2.019 ; +use IO::Compress::Base::Common 2.020 ; +use Compress::Raw::Zlib 2.020 ; +use IO::Compress::Gzip 2.020 ; +use IO::Uncompress::Gunzip 2.020 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.019'; +$VERSION = '2.020'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -452,7 +452,7 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.019 ; +use IO::Compress::Gzip::Constants 2.020 ; sub memGzip($) { diff --git a/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm index ebc2882..65c18bd 100644 --- a/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm +++ b/ext/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm @@ -4,13 +4,13 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status); +use IO::Compress::Base::Common 2.020 qw(:Status); #use Compress::Bzip2 ; -use Compress::Raw::Bzip2 2.019 ; +use Compress::Raw::Bzip2 2.020 ; our ($VERSION); -$VERSION = '2.019'; +$VERSION = '2.020'; sub mkCompObject { diff --git a/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm index aa2975f..db30dc2 100644 --- a/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm +++ b/ext/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status); +use IO::Compress::Base::Common 2.020 qw(:Status); -use Compress::Raw::Zlib 2.019 qw(Z_OK Z_FINISH MAX_WBITS) ; +use Compress::Raw::Zlib 2.020 qw(Z_OK Z_FINISH MAX_WBITS) ; our ($VERSION); -$VERSION = '2.019'; +$VERSION = '2.020'; sub mkCompObject { diff --git a/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm index 54cc35f..4314037 100644 --- a/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm +++ b/ext/IO-Compress/lib/IO/Compress/Adapter/Identity.pm @@ -4,10 +4,10 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status); +use IO::Compress::Base::Common 2.020 qw(:Status); our ($VERSION); -$VERSION = '2.019'; +$VERSION = '2.020'; sub mkCompObject { diff --git a/ext/IO-Compress/lib/IO/Compress/Base.pm b/ext/IO-Compress/lib/IO/Compress/Base.pm index eb8e7ee..98bf5b4 100644 --- a/ext/IO-Compress/lib/IO/Compress/Base.pm +++ b/ext/IO-Compress/lib/IO/Compress/Base.pm @@ -6,7 +6,7 @@ require 5.004 ; use strict ; use warnings; -use IO::Compress::Base::Common 2.019 ; +use IO::Compress::Base::Common 2.020 ; use IO::File ; use Scalar::Util qw(blessed readonly); @@ -20,7 +20,7 @@ use bytes; our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.019'; +$VERSION = '2.020'; #Can't locate object method "SWASHNEW" via package "utf8" (perhaps you forgot to load "utf8"?) at .../ext/Compress-Zlib/Gzip/blib/lib/Compress/Zlib/Common.pm line 16. diff --git a/ext/IO-Compress/lib/IO/Compress/Base/Common.pm b/ext/IO-Compress/lib/IO/Compress/Base/Common.pm index f7851f2..060921c 100644 --- a/ext/IO-Compress/lib/IO/Compress/Base/Common.pm +++ b/ext/IO-Compress/lib/IO/Compress/Base/Common.pm @@ -11,7 +11,7 @@ use File::GlobMapper; require Exporter; our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE); @ISA = qw(Exporter); -$VERSION = '2.019'; +$VERSION = '2.020'; @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput isaFileGlobString cleanFileGlobString oneTarget diff --git a/ext/IO-Compress/lib/IO/Compress/Bzip2.pm b/ext/IO-Compress/lib/IO/Compress/Bzip2.pm index 9e31e43..dcf337f 100644 --- a/ext/IO-Compress/lib/IO/Compress/Bzip2.pm +++ b/ext/IO-Compress/lib/IO/Compress/Bzip2.pm @@ -5,16 +5,16 @@ use warnings; use bytes; require Exporter ; -use IO::Compress::Base 2.019 ; +use IO::Compress::Base 2.020 ; -use IO::Compress::Base::Common 2.019 qw(createSelfTiedObject); -use IO::Compress::Adapter::Bzip2 2.019 ; +use IO::Compress::Base::Common 2.020 qw(createSelfTiedObject); +use IO::Compress::Adapter::Bzip2 2.020 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.019'; +$VERSION = '2.020'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.019 qw(:Parse); + use IO::Compress::Base::Common 2.020 qw(:Parse); return ( 'BlockSize100K' => [0, 1, Parse_unsigned, 1], diff --git a/ext/IO-Compress/lib/IO/Compress/Deflate.pm b/ext/IO-Compress/lib/IO/Compress/Deflate.pm index 89740ae..821576b 100644 --- a/ext/IO-Compress/lib/IO/Compress/Deflate.pm +++ b/ext/IO-Compress/lib/IO/Compress/Deflate.pm @@ -6,16 +6,16 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.019 ; +use IO::Compress::RawDeflate 2.020 ; -use Compress::Raw::Zlib 2.019 ; -use IO::Compress::Zlib::Constants 2.019 ; -use IO::Compress::Base::Common 2.019 qw(createSelfTiedObject); +use Compress::Raw::Zlib 2.020 ; +use IO::Compress::Zlib::Constants 2.020 ; +use IO::Compress::Base::Common 2.020 qw(createSelfTiedObject); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError); -$VERSION = '2.019'; +$VERSION = '2.020'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/ext/IO-Compress/lib/IO/Compress/Gzip.pm b/ext/IO-Compress/lib/IO/Compress/Gzip.pm index 51ba711..d3d38ea 100644 --- a/ext/IO-Compress/lib/IO/Compress/Gzip.pm +++ b/ext/IO-Compress/lib/IO/Compress/Gzip.pm @@ -8,12 +8,12 @@ use warnings; use bytes; -use IO::Compress::RawDeflate 2.019 ; +use IO::Compress::RawDeflate 2.020 ; -use Compress::Raw::Zlib 2.019 ; -use IO::Compress::Base::Common 2.019 qw(:Status :Parse createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.019 ; -use IO::Compress::Zlib::Extra 2.019 ; +use Compress::Raw::Zlib 2.020 ; +use IO::Compress::Base::Common 2.020 qw(:Status :Parse createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.020 ; +use IO::Compress::Zlib::Extra 2.020 ; BEGIN { @@ -27,7 +27,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError); -$VERSION = '2.019'; +$VERSION = '2.020'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); diff --git a/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm index dfda77d..4e1ce4e 100644 --- a/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm +++ b/ext/IO-Compress/lib/IO/Compress/Gzip/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names); our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE); -$VERSION = '2.019'; +$VERSION = '2.020'; @ISA = qw(Exporter); diff --git a/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm b/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm index 76e48dd..441ab48 100644 --- a/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm +++ b/ext/IO-Compress/lib/IO/Compress/RawDeflate.pm @@ -7,16 +7,16 @@ use warnings; use bytes; -use IO::Compress::Base 2.019 ; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); -use IO::Compress::Adapter::Deflate 2.019 ; +use IO::Compress::Base 2.020 ; +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); +use IO::Compress::Adapter::Deflate 2.020 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.019'; +$VERSION = '2.020'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -142,8 +142,8 @@ sub getZlibParams { my $self = shift ; - use IO::Compress::Base::Common 2.019 qw(:Parse); - use Compress::Raw::Zlib 2.019 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.020 qw(:Parse); + use Compress::Raw::Zlib 2.020 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); return ( diff --git a/ext/IO-Compress/lib/IO/Compress/Zip.pm b/ext/IO-Compress/lib/IO/Compress/Zip.pm index 07bff4a..2b176dc 100644 --- a/ext/IO-Compress/lib/IO/Compress/Zip.pm +++ b/ext/IO-Compress/lib/IO/Compress/Zip.pm @@ -4,21 +4,21 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); -use IO::Compress::RawDeflate 2.019 ; -use IO::Compress::Adapter::Deflate 2.019 ; -use IO::Compress::Adapter::Identity 2.019 ; -use IO::Compress::Zlib::Extra 2.019 ; -use IO::Compress::Zip::Constants 2.019 ; +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); +use IO::Compress::RawDeflate 2.020 ; +use IO::Compress::Adapter::Deflate 2.020 ; +use IO::Compress::Adapter::Identity 2.020 ; +use IO::Compress::Zlib::Extra 2.020 ; +use IO::Compress::Zip::Constants 2.020 ; -use Compress::Raw::Zlib 2.019 qw(crc32) ; +use Compress::Raw::Zlib 2.020 qw(crc32) ; BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.019 ; + import IO::Compress::Adapter::Bzip2 2.020 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.019 ; + import IO::Compress::Bzip2 2.020 ; } ; # eval { require IO::Compress::Adapter::Lzma ; # import IO::Compress::Adapter::Lzma 2.018 ; @@ -32,7 +32,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError); -$VERSION = '2.019'; +$VERSION = '2.020'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -467,8 +467,8 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.019 qw(:Parse); - use Compress::Raw::Zlib 2.019 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.020 qw(:Parse); + use Compress::Raw::Zlib 2.020 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); my @Bzip2 = (); diff --git a/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm index f5f5880..882e5af 100644 --- a/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm +++ b/ext/IO-Compress/lib/IO/Compress/Zip/Constants.pm @@ -7,7 +7,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.019'; +$VERSION = '2.020'; @ISA = qw(Exporter); diff --git a/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm index 4d942e0..8cf1cdc 100644 --- a/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm +++ b/ext/IO-Compress/lib/IO/Compress/Zlib/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.019'; +$VERSION = '2.020'; @ISA = qw(Exporter); diff --git a/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm index 287d0d1..ded6c4f 100644 --- a/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm +++ b/ext/IO-Compress/lib/IO/Compress/Zlib/Extra.pm @@ -8,9 +8,9 @@ use bytes; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.019'; +$VERSION = '2.020'; -use IO::Compress::Gzip::Constants 2.019 ; +use IO::Compress::Gzip::Constants 2.020 ; sub ExtraFieldError { diff --git a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm index 4d5df44..87459a2 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status); +use IO::Compress::Base::Common 2.020 qw(:Status); -use Compress::Raw::Bzip2 2.019 ; +use Compress::Raw::Bzip2 2.020 ; our ($VERSION, @ISA); -$VERSION = '2.019'; +$VERSION = '2.020'; sub mkUncompObject { @@ -21,10 +21,11 @@ sub mkUncompObject return (undef, "Could not create Inflation object: $status", $status) if $status != BZ_OK ; - return bless {'Inf' => $inflate, - 'CompSize' => 0, - 'UnCompSize' => 0, - 'Error' => '', + return bless {'Inf' => $inflate, + 'CompSize' => 0, + 'UnCompSize' => 0, + 'Error' => '', + 'ConsumesInput' => 1, } ; } diff --git a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm index df71eab..146b4c9 100755 --- a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm @@ -4,13 +4,13 @@ use warnings; use strict; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status); +use IO::Compress::Base::Common 2.020 qw(:Status); our ($VERSION); -$VERSION = '2.019'; +$VERSION = '2.020'; -use Compress::Raw::Zlib 2.019 (); +use Compress::Raw::Zlib 2.020 (); sub mkUncompObject { @@ -23,6 +23,8 @@ sub mkUncompObject 'CRC32' => Compress::Raw::Zlib::crc32(''), 'wantADLER32'=> $adler32, 'ADLER32' => Compress::Raw::Zlib::adler32(''), + 'ConsumesInput' => 1, + } ; } @@ -97,6 +99,7 @@ sub adler32 return $self->{ADLER32}; } + 1; __END__ diff --git a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm index 6ff1fb6..c8e9e17 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm @@ -4,11 +4,11 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status); -use Compress::Raw::Zlib 2.019 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.020 qw(:Status); +use Compress::Raw::Zlib 2.020 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.019'; +$VERSION = '2.020'; @@ -46,6 +46,7 @@ sub mkUncompObject 'CompSize' => 0, 'UnCompSize' => 0, 'Error' => '', + 'ConsumesInput' => 1, } ; } diff --git a/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index d0cfb11..2ae8876 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/AnyInflate.pm @@ -6,22 +6,22 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.020 qw(createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.019 (); +use IO::Uncompress::Adapter::Inflate 2.020 (); -use IO::Uncompress::Base 2.019 ; -use IO::Uncompress::Gunzip 2.019 ; -use IO::Uncompress::Inflate 2.019 ; -use IO::Uncompress::RawInflate 2.019 ; -use IO::Uncompress::Unzip 2.019 ; +use IO::Uncompress::Base 2.020 ; +use IO::Uncompress::Gunzip 2.020 ; +use IO::Uncompress::Inflate 2.020 ; +use IO::Uncompress::RawInflate 2.020 ; +use IO::Uncompress::Unzip 2.020 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.019'; +$VERSION = '2.020'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.019 qw(:Parse); + use IO::Compress::Base::Common 2.020 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; } diff --git a/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index 86971f1..4600d7c 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm @@ -4,16 +4,16 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.020 qw(createSelfTiedObject); -use IO::Uncompress::Base 2.019 ; +use IO::Uncompress::Base 2.020 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.019'; +$VERSION = '2.020'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,19 +27,19 @@ Exporter::export_ok_tags('all'); BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.019 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.019 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.019 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.019 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.020 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.020 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.020 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.020 ;'; #eval ' use IO::Uncompress::Adapter::UnLzma 2.018 ;'; - eval ' use IO::Uncompress::Bunzip2 2.019 ;'; - eval ' use IO::Uncompress::UnLzop 2.019 ;'; - eval ' use IO::Uncompress::Gunzip 2.019 ;'; - eval ' use IO::Uncompress::Inflate 2.019 ;'; - eval ' use IO::Uncompress::RawInflate 2.019 ;'; - eval ' use IO::Uncompress::Unzip 2.019 ;'; - eval ' use IO::Uncompress::UnLzf 2.019 ;'; + eval ' use IO::Uncompress::Bunzip2 2.020 ;'; + eval ' use IO::Uncompress::UnLzop 2.020 ;'; + eval ' use IO::Uncompress::Gunzip 2.020 ;'; + eval ' use IO::Uncompress::Inflate 2.020 ;'; + eval ' use IO::Uncompress::RawInflate 2.020 ;'; + eval ' use IO::Uncompress::Unzip 2.020 ;'; + eval ' use IO::Uncompress::UnLzf 2.020 ;'; #eval ' use IO::Uncompress::UnLzma 2.018 ;'; } @@ -58,7 +58,7 @@ sub anyuncompress sub getExtraParams { - use IO::Compress::Base::Common 2.019 qw(:Parse); + use IO::Compress::Base::Common 2.020 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; } diff --git a/ext/IO-Compress/lib/IO/Uncompress/Base.pm b/ext/IO-Compress/lib/IO/Uncompress/Base.pm index 54d0798..4507219 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Base.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Base.pm @@ -9,12 +9,12 @@ our (@ISA, $VERSION, @EXPORT_OK, %EXPORT_TAGS); @ISA = qw(Exporter IO::File); -$VERSION = '2.019'; +$VERSION = '2.020'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.019 ; +use IO::Compress::Base::Common 2.020 ; #use Parse::Parameters ; use IO::File ; @@ -854,11 +854,9 @@ sub _raw_read defined *$self->{CompressedInputLengthDone} || $self->smartEof(), $outSize); - $self->pushBack($temp_buf) if $beforeC_len != length $temp_buf; + # Remember the input buffer if it wasn't consumed completely + $self->pushBack($temp_buf) if *$self->{Uncomp}{ConsumesInput}; -#return $self->saveErrorString(G_ERR, "unexpected end of file", STATUS_ERROR) -# if $self->smartEof() && $status != STATUS_ENDSTREAM; - return $self->saveErrorString(G_ERR, *$self->{Uncomp}{Error}, *$self->{Uncomp}{ErrorNo}) if $self->saveStatus($status) == STATUS_ERROR; diff --git a/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm index 3b16c9f..b16890a 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Bunzip2.pm @@ -4,15 +4,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.019 ; -use IO::Uncompress::Adapter::Bunzip2 2.019 ; +use IO::Uncompress::Base 2.020 ; +use IO::Uncompress::Adapter::Bunzip2 2.020 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.019'; +$VERSION = '2.020'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -40,7 +40,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.019 qw(:Parse); + use IO::Compress::Base::Common 2.020 qw(:Parse); return ( 'Verbosity' => [1, 1, Parse_boolean, 0], diff --git a/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm index 9f289cb..bc19262 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Gunzip.pm @@ -9,12 +9,12 @@ use strict ; use warnings; use bytes; -use IO::Uncompress::RawInflate 2.019 ; +use IO::Uncompress::RawInflate 2.020 ; -use Compress::Raw::Zlib 2.019 qw( crc32 ) ; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.019 ; -use IO::Compress::Zlib::Extra 2.019 ; +use Compress::Raw::Zlib 2.020 qw( crc32 ) ; +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.020 ; +use IO::Compress::Zlib::Extra 2.020 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.019'; +$VERSION = '2.020'; sub new { @@ -47,7 +47,7 @@ sub gunzip sub getExtraParams { - use IO::Compress::Base::Common 2.019 qw(:Parse); + use IO::Compress::Base::Common 2.020 qw(:Parse); return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ; } diff --git a/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm b/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm index e58146a..3f28b45 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Inflate.pm @@ -5,15 +5,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); -use IO::Compress::Zlib::Constants 2.019 ; +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.020 ; -use IO::Uncompress::RawInflate 2.019 ; +use IO::Uncompress::RawInflate 2.020 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.019'; +$VERSION = '2.020'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); diff --git a/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm index 08815cb..49c2f57 100755 --- a/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/RawInflate.pm @@ -5,16 +5,16 @@ use strict ; use warnings; use bytes; -use Compress::Raw::Zlib 2.019 ; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); +use Compress::Raw::Zlib 2.020 ; +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.019 ; -use IO::Uncompress::Adapter::Inflate 2.019 ; +use IO::Uncompress::Base 2.020 ; +use IO::Uncompress::Adapter::Inflate 2.020 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.019'; +$VERSION = '2.020'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); diff --git a/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm b/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm index 6d30d28..1fee950 100644 --- a/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm +++ b/ext/IO-Compress/lib/IO/Uncompress/Unzip.pm @@ -8,14 +8,14 @@ use strict ; use warnings; use bytes; -use IO::Uncompress::RawInflate 2.019 ; -use IO::Compress::Base::Common 2.019 qw(:Status createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.019 ; -use IO::Uncompress::Adapter::Identity 2.019 ; -use IO::Compress::Zlib::Extra 2.019 ; -use IO::Compress::Zip::Constants 2.019 ; +use IO::Uncompress::RawInflate 2.020 ; +use IO::Compress::Base::Common 2.020 qw(:Status createSelfTiedObject); +use IO::Uncompress::Adapter::Inflate 2.020 ; +use IO::Uncompress::Adapter::Identity 2.020 ; +use IO::Compress::Zlib::Extra 2.020 ; +use IO::Compress::Zip::Constants 2.020 ; -use Compress::Raw::Zlib 2.019 qw(crc32) ; +use Compress::Raw::Zlib 2.020 qw(crc32) ; BEGIN { @@ -30,7 +30,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.019'; +$VERSION = '2.020'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -63,7 +63,7 @@ sub unzip sub getExtraParams { - use IO::Compress::Base::Common 2.019 qw(:Parse); + use IO::Compress::Base::Common 2.020 qw(:Parse); return ( diff --git a/ext/IO-Compress/t/000prereq.t b/ext/IO-Compress/t/000prereq.t index f2a687b..2746320 100644 --- a/ext/IO-Compress/t/000prereq.t +++ b/ext/IO-Compress/t/000prereq.t @@ -19,7 +19,7 @@ BEGIN if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; - my $VERSION = '2.019'; + my $VERSION = '2.020'; my @NAMES = qw( Compress::Raw::Bzip2 Compress::Raw::Zlib -- Perl5 Master Repository
