diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2013-08-13 00:03:39 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2013-08-13 00:03:39 +0100 |
| commit | ef379d05f8358df5b615354740daa4fa62b731ff (patch) | |
| tree | 2589732f48a90489249f6c50005e7effec978608 /cpan/IO-Compress/lib | |
| parent | 07513bb44fd7b13b454d0fec0774988fbce6476e (diff) | |
| download | perl-ef379d05f8358df5b615354740daa4fa62b731ff.tar.gz | |
Upgrade IO::Compress::* and Compress::Raw::* from 2.061 to 2.062
Diffstat (limited to 'cpan/IO-Compress/lib')
27 files changed, 376 insertions, 272 deletions
diff --git a/cpan/IO-Compress/lib/Compress/Zlib.pm b/cpan/IO-Compress/lib/Compress/Zlib.pm index 881a238add..465b07e1f0 100644 --- a/cpan/IO-Compress/lib/Compress/Zlib.pm +++ b/cpan/IO-Compress/lib/Compress/Zlib.pm @@ -7,17 +7,17 @@ use Carp ; use IO::Handle ; use Scalar::Util qw(dualvar); -use IO::Compress::Base::Common 2.061 ; -use Compress::Raw::Zlib 2.061 ; -use IO::Compress::Gzip 2.061 ; -use IO::Uncompress::Gunzip 2.061 ; +use IO::Compress::Base::Common 2.062 ; +use Compress::Raw::Zlib 2.062 ; +use IO::Compress::Gzip 2.062 ; +use IO::Uncompress::Gunzip 2.062 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.061'; +$VERSION = '2.062'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -461,7 +461,7 @@ sub inflate package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.061 ; +use IO::Compress::Gzip::Constants 2.062 ; sub memGzip($) { diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm index 73d929bff8..604ae63360 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Bzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status); +use IO::Compress::Base::Common 2.062 qw(:Status); -use Compress::Raw::Bzip2 2.061 ; +use Compress::Raw::Bzip2 2.062 ; our ($VERSION); -$VERSION = '2.061'; +$VERSION = '2.062'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm index da7f9e5366..07418c9c4e 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Deflate.pm @@ -4,13 +4,13 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status); -use Compress::Raw::Zlib 2.061 qw( !crc32 !adler32 ) ; +use IO::Compress::Base::Common 2.062 qw(:Status); +use Compress::Raw::Zlib 2.062 qw( !crc32 !adler32 ) ; require Exporter; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, @EXPORT, %DEFLATE_CONSTANTS); -$VERSION = '2.061'; +$VERSION = '2.062'; @ISA = qw(Exporter); @EXPORT_OK = @Compress::Raw::Zlib::DEFLATE_CONSTANTS; %EXPORT_TAGS = %Compress::Raw::Zlib::DEFLATE_CONSTANTS; diff --git a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm index c4e2933d68..23aab588f0 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Adapter/Identity.pm @@ -4,10 +4,10 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status); +use IO::Compress::Base::Common 2.062 qw(:Status); our ($VERSION); -$VERSION = '2.061'; +$VERSION = '2.062'; sub mkCompObject { diff --git a/cpan/IO-Compress/lib/IO/Compress/Base.pm b/cpan/IO-Compress/lib/IO/Compress/Base.pm index d6802526fb..32a7f6e487 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Base.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Base.pm @@ -6,7 +6,7 @@ require 5.006 ; use strict ; use warnings; -use IO::Compress::Base::Common 2.061 ; +use IO::Compress::Base::Common 2.062 ; use IO::File (); ; use Scalar::Util (); @@ -20,7 +20,7 @@ use Symbol(); our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.061'; +$VERSION = '2.062'; #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. @@ -1019,7 +1019,7 @@ IO::Compress::Base - Base Class for IO::Compress modules =head1 DESCRIPTION This module is not intended for direct use in application code. Its sole -purpose if to to be sub-classed by IO::Compress modules. +purpose is to be sub-classed by IO::Compress modules. =head1 SEE ALSO diff --git a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm b/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm index f3b5350d28..ff2f0de4e1 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Base/Common.pm +++ b/cpan/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.061'; +$VERSION = '2.062'; @EXPORT = qw( isaFilehandle isaFilename isaScalar whatIsInput whatIsOutput diff --git a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm index 83f425d9f1..a5d5af2128 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Bzip2.pm @@ -5,16 +5,16 @@ use warnings; use bytes; require Exporter ; -use IO::Compress::Base 2.061 ; +use IO::Compress::Base 2.062 ; -use IO::Compress::Base::Common 2.061 qw(); -use IO::Compress::Adapter::Bzip2 2.061 ; +use IO::Compress::Base::Common 2.062 qw(); +use IO::Compress::Adapter::Bzip2 2.062 ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bzip2Error); -$VERSION = '2.061'; +$VERSION = '2.062'; $Bzip2Error = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -51,7 +51,7 @@ sub getExtraParams { my $self = shift ; - use IO::Compress::Base::Common 2.061 qw(:Parse); + use IO::Compress::Base::Common 2.062 qw(:Parse); return ( 'blocksize100k' => [IO::Compress::Base::Common::Parse_unsigned, 1], @@ -204,19 +204,20 @@ section. use IO::Compress::Bzip2 qw(bzip2 $Bzip2Error) ; - bzip2 $input => $output [,OPTS] + bzip2 $input_filename_or_reference => $output_filename_or_reference [,OPTS] or die "bzip2 failed: $Bzip2Error\n"; The functional interface needs Perl5.005 or better. -=head2 bzip2 $input => $output [, OPTS] +=head2 bzip2 $input_filename_or_reference => $output_filename_or_reference [, OPTS] -C<bzip2> expects at least two parameters, C<$input> and C<$output>. +C<bzip2> expects at least two parameters, +C<$input_filename_or_reference> and C<$output_filename_or_reference>. -=head3 The C<$input> parameter +=head3 The C<$input_filename_or_reference> parameter -The parameter, C<$input>, is used to define the source of -the uncompressed data. +The parameter, C<$input_filename_or_reference>, is used to define the +source of the uncompressed data. It can take one of the following forms: @@ -224,25 +225,25 @@ It can take one of the following forms: =item A filename -If the C<$input> parameter is a simple scalar, it is assumed to be a -filename. This file will be opened for reading and the input data -will be read from it. +If the <$input_filename_or_reference> parameter is a simple scalar, it is +assumed to be a filename. This file will be opened for reading and the +input data will be read from it. =item A filehandle -If the C<$input> parameter is a filehandle, the input data will be -read from it. -The string '-' can be used as an alias for standard input. +If the C<$input_filename_or_reference> parameter is a filehandle, the input +data will be read from it. The string '-' can be used as an alias for +standard input. =item A scalar reference -If C<$input> is a scalar reference, the input data will be read -from C<$$input>. +If C<$input_filename_or_reference> is a scalar reference, the input data +will be read from C<$$input_filename_or_reference>. =item An array reference -If C<$input> is an array reference, each element in the array must be a -filename. +If C<$input_filename_or_reference> is an array reference, each element in +the array must be a filename. The input data will be read from each file in turn. @@ -251,65 +252,72 @@ contains valid filenames before any data is compressed. =item An Input FileGlob string -If C<$input> is a string that is delimited by the characters "<" and ">" -C<bzip2> will assume that it is an I<input fileglob string>. The -input is the list of files that match the fileglob. - -If the fileglob does not match any files ... +If C<$input_filename_or_reference> is a string that is delimited by the +characters "<" and ">" C<bzip2> will assume that it is an +I<input fileglob string>. The input is the list of files that match the +fileglob. See L<File::GlobMapper|File::GlobMapper> for more details. =back -If the C<$input> parameter is any other type, C<undef> will be returned. +If the C<$input_filename_or_reference> parameter is any other type, +C<undef> will be returned. -=head3 The C<$output> parameter +=head3 The C<$output_filename_or_reference> parameter -The parameter C<$output> is used to control the destination of the -compressed data. This parameter can take one of these forms. +The parameter C<$output_filename_or_reference> is used to control the +destination of the compressed data. This parameter can take one of +these forms. =over 5 =item A filename -If the C<$output> parameter is a simple scalar, it is assumed to be a -filename. This file will be opened for writing and the compressed -data will be written to it. +If the C<$output_filename_or_reference> parameter is a simple scalar, it is +assumed to be a filename. This file will be opened for writing and the +compressed data will be written to it. =item A filehandle -If the C<$output> parameter is a filehandle, the compressed data -will be written to it. -The string '-' can be used as an alias for standard output. +If the C<$output_filename_or_reference> parameter is a filehandle, the +compressed data will be written to it. The string '-' can be used as +an alias for standard output. =item A scalar reference -If C<$output> is a scalar reference, the compressed data will be -stored in C<$$output>. +If C<$output_filename_or_reference> is a scalar reference, the +compressed data will be stored in C<$$output_filename_or_reference>. =item An Array Reference -If C<$output> is an array reference, the compressed data will be -pushed onto the array. +If C<$output_filename_or_reference> is an array reference, +the compressed data will be pushed onto the array. =item An Output FileGlob -If C<$output> is a string that is delimited by the characters "<" and ">" -C<bzip2> will assume that it is an I<output fileglob string>. The -output is the list of files that match the fileglob. +If C<$output_filename_or_reference> is a string that is delimited by the +characters "<" and ">" C<bzip2> will assume that it is an +I<output fileglob string>. The output is the list of files that match the +fileglob. -When C<$output> is an fileglob string, C<$input> must also be a fileglob -string. Anything else is an error. +When C<$output_filename_or_reference> is an fileglob string, +C<$input_filename_or_reference> must also be a fileglob string. Anything +else is an error. + +See L<File::GlobMapper|File::GlobMapper> for more details. =back -If the C<$output> parameter is any other type, C<undef> will be returned. +If the C<$output_filename_or_reference> parameter is any other type, +C<undef> will be returned. =head2 Notes -When C<$input> maps to multiple files/buffers and C<$output> is a single +When C<$input_filename_or_reference> maps to multiple files/buffers and +C<$output_filename_or_reference> is a single file/buffer the input files/buffers will be stored -in C<$output> as a concatenated series of compressed data streams. +in C<$output_filename_or_reference> as a concatenated series of compressed data streams. =head2 Optional Parameters @@ -338,7 +346,48 @@ Defaults to 0. =item C<< Append => 0|1 >> -TODO +The behaviour of this option is dependent on the type of output data +stream. + +=over 5 + +=item * A Buffer + +If C<Append> is enabled, all compressed data will be append to the end of +the output buffer. Otherwise the output buffer will be cleared before any +compressed data is written to it. + +=item * A Filename + +If C<Append> is enabled, the file will be opened in append mode. Otherwise +the contents of the file, if any, will be truncated before any compressed +data is written to it. + +=item * A Filehandle + +If C<Append> is enabled, the filehandle will be positioned to the end of +the file via a call to C<seek> before any compressed data is +written to it. Otherwise the file pointer will not be moved. + +=back + +When C<Append> is specified, and set to true, it will I<append> all compressed +data to the output data stream. + +So when the output is a filehandle it will carry out a seek to the eof +before writing any compressed data. If the output is a filename, it will be opened for +appending. If the output is a buffer, all compressed data will be +appended to the existing buffer. + +Conversely when C<Append> is not specified, or it is present and is set to +false, it will operate as follows. + +When the output is a filename, it will truncate the contents of the file +before writing any compressed data. If the output is a filehandle +its position will not be changed. If the output is a buffer, it will be +wiped before any compressed data is output. + +Defaults to 0. =back @@ -467,7 +516,7 @@ The behaviour of this option is dependent on the type of C<$output>. =item * A Buffer If C<$output> is a buffer and C<Append> is enabled, all compressed data -will be append to the end if C<$output>. Otherwise C<$output> will be +will be append to the end of C<$output>. Otherwise C<$output> will be cleared before any data is written to it. =item * A Filename @@ -657,7 +706,7 @@ If the C<$z> object is associated with a file or a filehandle, C<fileno> will return the underlying file descriptor. Once the C<close> method is called C<fileno> will return C<undef>. -If the C<$z> object is is associated with a buffer, this method will return +If the C<$z> object is associated with a buffer, this method will return C<undef>. =head2 close @@ -693,7 +742,7 @@ Usage is Closes the current compressed data stream and starts a new one. -OPTS consists of any of the the options that are available when creating +OPTS consists of any of the options that are available when creating the C<$z> object. See the L</"Constructor Options"> section for more details. @@ -719,19 +768,17 @@ Same as doing this =head2 Apache::GZip Revisited -See L<IO::Compress::Bzip2::FAQ|IO::Compress::Bzip2::FAQ/"Apache::GZip Revisited"> - - +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Apache::GZip Revisited"> =head2 Working with Net::FTP -See L<IO::Compress::Bzip2::FAQ|IO::Compress::Bzip2::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head1 SEE ALSO -L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress> +L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Uncompress::Bunzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress> -L<Compress::Zlib::FAQ|Compress::Zlib::FAQ> +L<IO::Compress::FAQ|IO::Compress::FAQ> L<File::GlobMapper|File::GlobMapper>, L<Archive::Zip|Archive::Zip>, L<Archive::Tar|Archive::Tar>, @@ -751,7 +798,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2008 Paul Marquess. All rights reserved. +Copyright (c) 2005-2013 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm index 63b864126c..fc626f948a 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Deflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Deflate.pm @@ -8,16 +8,16 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.061 (); -use IO::Compress::Adapter::Deflate 2.061 ; +use IO::Compress::RawDeflate 2.062 (); +use IO::Compress::Adapter::Deflate 2.062 ; -use IO::Compress::Zlib::Constants 2.061 ; -use IO::Compress::Base::Common 2.061 qw(); +use IO::Compress::Zlib::Constants 2.062 ; +use IO::Compress::Base::Common 2.062 qw(); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $DeflateError); -$VERSION = '2.061'; +$VERSION = '2.062'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -821,7 +821,7 @@ Usage is Closes the current compressed data stream and starts a new one. -OPTS consists of any of the the options that are available when creating +OPTS consists of any of the options that are available when creating the C<$z> object. See the L</"Constructor Options"> section for more details. diff --git a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod index 8750e47c83..f983a69a84 100644 --- a/cpan/IO-Compress/lib/IO/Compress/FAQ.pod +++ b/cpan/IO-Compress/lib/IO/Compress/FAQ.pod @@ -112,7 +112,7 @@ formats store extra information along with the compressed data payload. For example, gzip can optionally store the original filename and Zip stores a lot of information about the original file. If the original compressed file contains any of this extra information, it will not be transferred to the -new compressed file usign the technique above. +new compressed file using the technique above. =head1 ZIP @@ -213,7 +213,7 @@ The example below illustrates this behaviour abc def -By default C<IO::Uncompress::Gunzip> will I<not> bahave like the gunzip +By default C<IO::Uncompress::Gunzip> will I<not> behave like the gunzip program. It will only uncompress the first gzip data stream in the file, as shown below @@ -252,7 +252,7 @@ The example below illustrates this behaviour abc def -By default C<IO::Uncompress::Bunzip2> will I<not> bahave like the bunzip2 +By default C<IO::Uncompress::Bunzip2> will I<not> behave like the bunzip2 program. It will only uncompress the first bunzip2 data stream in the file, as shown below diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm index f5f87281d9..a66e0e22fe 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Gzip.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Gzip.pm @@ -8,12 +8,12 @@ use bytes; require Exporter ; -use IO::Compress::RawDeflate 2.061 () ; -use IO::Compress::Adapter::Deflate 2.061 ; +use IO::Compress::RawDeflate 2.062 () ; +use IO::Compress::Adapter::Deflate 2.062 ; -use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Compress::Gzip::Constants 2.061 ; -use IO::Compress::Zlib::Extra 2.061 ; +use IO::Compress::Base::Common 2.062 qw(:Status ); +use IO::Compress::Gzip::Constants 2.062 ; +use IO::Compress::Zlib::Extra 2.062 ; BEGIN { @@ -25,7 +25,7 @@ BEGIN our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $GzipError); -$VERSION = '2.061'; +$VERSION = '2.062'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -194,7 +194,7 @@ sub mkHeader my $self = shift ; my $param = shift ; - # stort-circuit if a minimal header is requested. + # short-circuit if a minimal header is requested. return GZIP_MINIMUM_HEADER if $param->getValue('minimal') ; # METHOD @@ -257,7 +257,8 @@ sub mkHeader } # HEADER CRC - $out .= pack("v", Compress::Raw::Zlib::crc32($out) & 0x00FF ) if $param->getValue('headercrc') ; + $out .= pack("v", Compress::Raw::Zlib::crc32($out) & 0x00FF ) + if $param->getValue('headercrc') ; noUTF8($out); @@ -801,7 +802,7 @@ and set the CRC16 header field to the CRC of the complete gzip header except the CRC16 field itself. B<Note> that gzip files created with the C<HeaderCRC> flag set to 1 cannot -be read by most, if not all, of the the standard gunzip utilities, most +be read by most, if not all, of the standard gunzip utilities, most notably gzip version 1.2.4. You should therefore avoid using this option if you want to maximize the portability of your gzip files. @@ -1132,7 +1133,7 @@ Usage is Closes the current compressed data stream and starts a new one. -OPTS consists of any of the the options that are available when creating +OPTS consists of any of the options that are available when creating the C<$z> object. See the L</"Constructor Options"> section for more details. diff --git a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm index 8081ef6f6a..96387681a7 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Gzip/Constants.pm +++ b/cpan/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.061'; +$VERSION = '2.062'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm index cc09b46086..3cd75e2551 100644 --- a/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm +++ b/cpan/IO-Compress/lib/IO/Compress/RawDeflate.pm @@ -6,15 +6,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base 2.061 ; -use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Compress::Adapter::Deflate 2.061 ; +use IO::Compress::Base 2.062 ; +use IO::Compress::Base::Common 2.062 qw(:Status ); +use IO::Compress::Adapter::Deflate 2.062 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.061'; +$VERSION = '2.062'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -116,8 +116,8 @@ sub getExtraParams return getZlibParams(); } -use IO::Compress::Base::Common 2.061 qw(:Parse); -use Compress::Raw::Zlib 2.061 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); +use IO::Compress::Base::Common 2.062 qw(:Parse); +use Compress::Raw::Zlib 2.062 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); our %PARAMS = ( #'method' => [IO::Compress::Base::Common::Parse_unsigned, Z_DEFLATED], 'level' => [IO::Compress::Base::Common::Parse_signed, Z_DEFAULT_COMPRESSION], @@ -877,7 +877,7 @@ Usage is Closes the current compressed data stream and starts a new one. -OPTS consists of any of the the options that are available when creating +OPTS consists of any of the options that are available when creating the C<$z> object. See the L</"Constructor Options"> section for more details. diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip.pm b/cpan/IO-Compress/lib/IO/Compress/Zip.pm index a0b22d67e5..9d2d7820f4 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zip.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zip.pm @@ -4,30 +4,30 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Compress::RawDeflate 2.061 (); -use IO::Compress::Adapter::Deflate 2.061 ; -use IO::Compress::Adapter::Identity 2.061 ; -use IO::Compress::Zlib::Extra 2.061 ; -use IO::Compress::Zip::Constants 2.061 ; +use IO::Compress::Base::Common 2.062 qw(:Status ); +use IO::Compress::RawDeflate 2.062 (); +use IO::Compress::Adapter::Deflate 2.062 ; +use IO::Compress::Adapter::Identity 2.062 ; +use IO::Compress::Zlib::Extra 2.062 ; +use IO::Compress::Zip::Constants 2.062 ; use File::Spec(); use Config; -use Compress::Raw::Zlib 2.061 (); +use Compress::Raw::Zlib 2.062 (); BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.061 ; + import IO::Compress::Adapter::Bzip2 2.062 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.061 ; + import IO::Compress::Bzip2 2.062 ; } ; eval { require IO::Compress::Adapter::Lzma ; - import IO::Compress::Adapter::Lzma 2.061 ; + import IO::Compress::Adapter::Lzma 2.062 ; require IO::Compress::Lzma ; - import IO::Compress::Lzma 2.061 ; + import IO::Compress::Lzma 2.062 ; } ; } @@ -36,7 +36,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $ZipError); -$VERSION = '2.061'; +$VERSION = '2.062'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -1328,7 +1328,7 @@ normalized filename will be passed to the sub. If you use C<FilterName> to modify the filename, it is your responsibility to keep the filename in Unix format. -Although this option can be used with the OO ointerface, it is of most use +Although this option can be used with the OO interface, it is of most use with the one-shot interface. For example, the code below shows how C<FilterName> can be used to remove the path component from a series of filenames before they are stored in C<$zipfile>. @@ -1410,7 +1410,7 @@ and C<$gid>. These values correspond to the numeric User ID (UID) and Group ID (GID) of the owner of the files respectively. When the C<exUnixN> option is present it will trigger the creation of a -UnixN extra field (ID is "ux") in bothe the local and central zip headers. +UnixN extra field (ID is "ux") in both the local and central zip headers. This will be populated with C<$uid> and C<$gid>. The UID & GID are stored as 32-bit integers. @@ -1586,7 +1586,7 @@ Valid values are 0-9 and C<LZMA_PRESET_DEFAULT>. 0 is the fastest compression with the lowest memory usage and the lowest compression. -9 is the slowest compession with the highest memory usage but with the best +9 is the slowest compression with the highest memory usage but with the best compression. This option is only valid if the C<Method> is ZIP_CM_LZMA. It is ignored @@ -1833,7 +1833,7 @@ Usage is Closes the current compressed data stream and starts a new one. -OPTS consists of any of the the options that are available when creating +OPTS consists of any of the options that are available when creating the C<$z> object. See the L</"Constructor Options"> section for more details. diff --git a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm index 2b15ab4a0e..032f3fba65 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zip/Constants.pm @@ -7,7 +7,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.061'; +$VERSION = '2.062'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm index 1bd38ada29..20057fcdd7 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Constants.pm @@ -9,7 +9,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.061'; +$VERSION = '2.062'; @ISA = qw(Exporter); diff --git a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm index a5b64ccee8..c28329d88c 100644 --- a/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm +++ b/cpan/IO-Compress/lib/IO/Compress/Zlib/Extra.pm @@ -8,9 +8,9 @@ use bytes; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.061'; +$VERSION = '2.062'; -use IO::Compress::Gzip::Constants 2.061 ; +use IO::Compress::Gzip::Constants 2.062 ; sub ExtraFieldError { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm index 02bf7fd0e5..0e34dd3435 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Bunzip2.pm @@ -4,12 +4,12 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status); +use IO::Compress::Base::Common 2.062 qw(:Status); -use Compress::Raw::Bzip2 2.061 ; +use Compress::Raw::Bzip2 2.062 ; our ($VERSION, @ISA); -$VERSION = '2.061'; +$VERSION = '2.062'; sub mkUncompObject { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm index 721c47374d..07b85014d1 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Identity.pm @@ -4,14 +4,14 @@ use warnings; use strict; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status); +use IO::Compress::Base::Common 2.062 qw(:Status); use IO::Compress::Zip::Constants ; our ($VERSION); -$VERSION = '2.061'; +$VERSION = '2.062'; -use Compress::Raw::Zlib 2.061 (); +use Compress::Raw::Zlib 2.062 (); sub mkUncompObject { diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm index c1fcaf9248..2baae6efea 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Adapter/Inflate.pm @@ -4,11 +4,11 @@ use strict; use warnings; #use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status); -use Compress::Raw::Zlib 2.061 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.062 qw(:Status); +use Compress::Raw::Zlib 2.062 qw(Z_OK Z_BUF_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.061'; +$VERSION = '2.062'; diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm index 5f2062a506..bf4fb94db6 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyInflate.pm @@ -6,22 +6,22 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 (); +use IO::Compress::Base::Common 2.062 (); -use IO::Uncompress::Adapter::Inflate 2.061 (); +use IO::Uncompress::Adapter::Inflate 2.062 (); -use IO::Uncompress::Base 2.061 ; -use IO::Uncompress::Gunzip 2.061 ; -use IO::Uncompress::Inflate 2.061 ; -use IO::Uncompress::RawInflate 2.061 ; -use IO::Uncompress::Unzip 2.061 ; +use IO::Uncompress::Base 2.062 ; +use IO::Uncompress::Gunzip 2.062 ; +use IO::Uncompress::Inflate 2.062 ; +use IO::Uncompress::RawInflate 2.062 ; +use IO::Uncompress::Unzip 2.062 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.061'; +$VERSION = '2.062'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub anyinflate sub getExtraParams { - use IO::Compress::Base::Common 2.061 qw(:Parse); + use IO::Compress::Base::Common 2.062 qw(:Parse); return ( 'rawinflate' => [Parse_boolean, 0] ) ; } @@ -704,7 +704,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -742,7 +742,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -810,7 +810,7 @@ It is a fatal error to attempt to seek backward. Note that the implementation of C<seek> in this module does not provide true random access to a compressed file/buffer. It works by uncompressing data from the current offset in the file/buffer until it reaches the -ucompressed offset specified in the parameters to C<seek>. For very small +uncompressed offset specified in the parameters to C<seek>. For very small files this may be acceptable behaviour. For large files it may cause an unacceptable delay. @@ -859,7 +859,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno diff --git a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm index ce73a56614..882033ce1f 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/AnyUncompress.pm @@ -4,16 +4,16 @@ use strict; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 (); +use IO::Compress::Base::Common 2.062 (); -use IO::Uncompress::Base 2.061 ; +use IO::Uncompress::Base 2.062 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.061'; +$VERSION = '2.062'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,22 +27,22 @@ Exporter::export_ok_tags('all'); BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.061 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.061 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.061 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.061 ;'; - eval ' use IO::Uncompress::Adapter::UnLzma 2.061 ;'; - eval ' use IO::Uncompress::Adapter::UnXz 2.061 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.061 ;'; - eval ' use IO::Uncompress::UnLzop 2.061 ;'; - eval ' use IO::Uncompress::Gunzip 2.061 ;'; - eval ' use IO::Uncompress::Inflate 2.061 ;'; - eval ' use IO::Uncompress::RawInflate 2.061 ;'; - eval ' use IO::Uncompress::Unzip 2.061 ;'; - eval ' use IO::Uncompress::UnLzf 2.061 ;'; - eval ' use IO::Uncompress::UnLzma 2.061 ;'; - eval ' use IO::Uncompress::UnXz 2.061 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.062 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.062 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.062 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.062 ;'; + eval ' use IO::Uncompress::Adapter::UnLzma 2.062 ;'; + eval ' use IO::Uncompress::Adapter::UnXz 2.062 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.062 ;'; + eval ' use IO::Uncompress::UnLzop 2.062 ;'; + eval ' use IO::Uncompress::Gunzip 2.062 ;'; + eval ' use IO::Uncompress::Inflate 2.062 ;'; + eval ' use IO::Uncompress::RawInflate 2.062 ;'; + eval ' use IO::Uncompress::Unzip 2.062 ;'; + eval ' use IO::Uncompress::UnLzf 2.062 ;'; + eval ' use IO::Uncompress::UnLzma 2.062 ;'; + eval ' use IO::Uncompress::UnXz 2.062 ;'; } sub new @@ -759,7 +759,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -797,7 +797,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -857,7 +857,7 @@ It is a fatal error to attempt to seek backward. Note that the implementation of C<seek> in this module does not provide true random access to a compressed file/buffer. It works by uncompressing data from the current offset in the file/buffer until it reaches the -ucompressed offset specified in the parameters to C<seek>. For very small +uncompressed offset specified in the parameters to C<seek>. For very small files this may be acceptable behaviour. For large files it may cause an unacceptable delay. @@ -906,7 +906,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm b/cpan/IO-Compress/lib/IO/Uncompress/Base.pm index b6df7c031c..7c74c51f78 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Base.pm +++ b/cpan/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.061'; +$VERSION = '2.062'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.061 ; +use IO::Compress::Base::Common 2.062 ; use IO::File ; use Symbol; @@ -961,7 +961,7 @@ sub _raw_read $self->pushBack($trailer) ; } - # TODO - if want to file file pointer, do it here + # TODO - if want file pointer, do it here if (! $self->smartEof()) { *$self->{NewStream} = 1 ; @@ -1526,7 +1526,7 @@ IO::Uncompress::Base - Base Class for IO::Uncompress modules =head1 DESCRIPTION This module is not intended for direct use in application code. Its sole -purpose if to to be sub-classed by IO::Uncompress modules. +purpose is to be sub-classed by IO::Uncompress modules. =head1 SEE ALSO diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm index 0aeef1fe0b..3d69014bea 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Bunzip2.pm @@ -4,15 +4,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status ); +use IO::Compress::Base::Common 2.062 qw(:Status ); -use IO::Uncompress::Base 2.061 ; -use IO::Uncompress::Adapter::Bunzip2 2.061 ; +use IO::Uncompress::Base 2.062 ; +use IO::Uncompress::Adapter::Bunzip2 2.062 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $Bunzip2Error); -$VERSION = '2.061'; +$VERSION = '2.062'; $Bunzip2Error = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -201,19 +201,20 @@ section. use IO::Uncompress::Bunzip2 qw(bunzip2 $Bunzip2Error) ; - bunzip2 $input => $output [,OPTS] + bunzip2 $input_filename_or_reference => $output_filename_or_reference [,OPTS] or die "bunzip2 failed: $Bunzip2Error\n"; The functional interface needs Perl5.005 or better. -=head2 bunzip2 $input => $output [, OPTS] +=head2 bunzip2 $input_filename_or_reference => $output_filename_or_reference [, OPTS] -C<bunzip2> expects at least two parameters, C<$input> and C<$output>. +C<bunzip2> expects at least two parameters, +C<$input_filename_or_reference> and C<$output_filename_or_reference>. -=head3 The C<$input> parameter +=head3 The C<$input_filename_or_reference> parameter -The parameter, C<$input>, is used to define the source of -the compressed data. +The parameter, C<$input_filename_or_reference>, is used to define the +source of the compressed data. It can take one of the following forms: @@ -221,25 +222,25 @@ It can take one of the following forms: =item A filename -If the C<$input> parameter is a simple scalar, it is assumed to be a -filename. This file will be opened for reading and the input data -will be read from it. +If the <$input_filename_or_reference> parameter is a simple scalar, it is +assumed to be a filename. This file will be opened for reading and the +input data will be read from it. =item A filehandle -If the C<$input> parameter is a filehandle, the input data will be -read from it. -The string '-' can be used as an alias for standard input. +If the C<$input_filename_or_reference> parameter is a filehandle, the input +data will be read from it. The string '-' can be used as an alias for +standard input. =item A scalar reference -If C<$input> is a scalar reference, the input data will be read -from C<$$input>. +If C<$input_filename_or_reference> is a scalar reference, the input data +will be read from C<$$input_filename_or_reference>. =item An array reference -If C<$input> is an array reference, each element in the array must be a -filename. +If C<$input_filename_or_reference> is an array reference, each element in +the array must be a filename. The input data will be read from each file in turn. @@ -248,64 +249,71 @@ contains valid filenames before any data is uncompressed. =item An Input FileGlob string -If C<$input> is a string that is delimited by the characters "<" and ">" -C<bunzip2> will assume that it is an I<input fileglob string>. The -input is the list of files that match the fileglob. - -If the fileglob does not match any files ... +If C<$input_filename_or_reference> is a string that is delimited by the +characters "<" and ">" C<bunzip2> will assume that it is an +I<input fileglob string>. The input is the list of files that match the +fileglob. See L<File::GlobMapper|File::GlobMapper> for more details. =back -If the C<$input> parameter is any other type, C<undef> will be returned. +If the C<$input_filename_or_reference> parameter is any other type, +C<undef> will be returned. -=head3 The C<$output> parameter +=head3 The C<$output_filename_or_reference> parameter -The parameter C<$output> is used to control the destination of the -uncompressed data. This parameter can take one of these forms. +The parameter C<$output_filename_or_reference> is used to control the +destination of the uncompressed data. This parameter can take one of +these forms. =over 5 =item A filename -If the C<$output> parameter is a simple scalar, it is assumed to be a -filename. This file will be opened for writing and the uncompressed -data will be written to it. +If the C<$output_filename_or_reference> parameter is a simple scalar, it is +assumed to be a filename. This file will be opened for writing and the +uncompressed data will be written to it. =item A filehandle -If the C<$output> parameter is a filehandle, the uncompressed data -will be written to it. -The string '-' can be used as an alias for standard output. +If the C<$output_filename_or_reference> parameter is a filehandle, the +uncompressed data will be written to it. The string '-' can be used as +an alias for standard output. =item A scalar reference -If C<$output> is a scalar reference, the uncompressed data will be -stored in C<$$output>. +If C<$output_filename_or_reference> is a scalar reference, the +uncompressed data will be stored in C<$$output_filename_or_reference>. =item An Array Reference -If C<$output> is an array reference, the uncompressed data will be -pushed onto the array. +If C<$output_filename_or_reference> is an array reference, +the uncompressed data will be pushed onto the array. =item An Output FileGlob -If C<$output> is a string that is delimited by the characters "<" and ">" -C<bunzip2> will assume that it is an I<output fileglob string>. The -output is the list of files that match the fileglob. +If C<$output_filename_or_reference> is a string that is delimited by the +characters "<" and ">" C<bunzip2> will assume that it is an +I<output fileglob string>. The output is the list of files that match the +fileglob. -When C<$output> is an fileglob string, C<$input> must also be a fileglob -string. Anything else is an error. +When C<$output_filename_or_reference> is an fileglob string, +C<$input_filename_or_reference> must also be a fileglob string. Anything +else is an error. + +See L<File::GlobMapper|File::GlobMapper> for more details. =back -If the C<$output> parameter is any other type, C<undef> will be returned. +If the C<$output_filename_or_reference> parameter is any other type, +C<undef> will be returned. =head2 Notes -When C<$input> maps to multiple compressed files/buffers and C<$output> is -a single file/buffer, after uncompression C<$output> will contain a +When C<$input_filename_or_reference> maps to multiple compressed +files/buffers and C<$output_filename_or_reference> is +a single file/buffer, after uncompression C<$output_filename_or_reference> will contain a concatenation of all the uncompressed data from each of the input files/buffers. @@ -337,7 +345,48 @@ Defaults to 0. =item C<< Append => 0|1 >> -TODO +The behaviour of this option is dependent on the type of output data +stream. + +=over 5 + +=item * A Buffer + +If C<Append> is enabled, all uncompressed data will be append to the end of +the output buffer. Otherwise the output buffer will be cleared before any +uncompressed data is written to it. + +=item * A Filename + +If C<Append> is enabled, the file will be opened in append mode. Otherwise +the contents of the file, if any, will be truncated before any uncompressed +data is written to it. + +=item * A Filehandle + +If C<Append> is enabled, the filehandle will be positioned to the end of +the file via a call to C<seek> before any uncompressed data is +written to it. Otherwise the file pointer will not be moved. + +=back + +When C<Append> is specified, and set to true, it will I<append> all uncompressed +data to the output data stream. + +So when the output is a filehandle it will carry out a seek to the eof +before writing any uncompressed data. If the output is a filename, it will be opened for +appending. If the output is a buffer, all uncompressed data will be +appended to the existing buffer. + +Conversely when C<Append> is not specified, or it is present and is set to +false, it will operate as follows. + +When the output is a filename, it will truncate the contents of the file +before writing any uncompressed data. If the output is a filehandle +its position will not be changed. If the output is a buffer, it will be +wiped before any uncompressed data is output. + +Defaults to 0. =item C<< MultiStream => 0|1 >> @@ -374,7 +423,7 @@ C<InputLength> option. =head2 Examples To read the contents of the file C<file1.txt.bz2> and write the -compressed data to the file C<file1.txt>. +uncompressed data to the file C<file1.txt>. use strict ; use warnings ; @@ -462,7 +511,7 @@ The string '-' can be used as an alias for standard input. =item A scalar reference If C<$input> is a scalar reference, the compressed data will be read from -C<$$output>. +C<$$input>. =back @@ -517,7 +566,7 @@ the module will allow reading of it anyway. In addition, if the input file/buffer does contain compressed data and there is non-compressed data immediately following it, setting this option -will make this module treat the whole file/bufffer as a single data stream. +will make this module treat the whole file/buffer as a single data stream. This option defaults to 1. @@ -580,7 +629,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -618,7 +667,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -675,6 +724,13 @@ Provides a sub-set of the C<seek> functionality, with the restriction that it is only legal to seek forward in the input file/buffer. It is a fatal error to attempt to seek backward. +Note that the implementation of C<seek> in this module does not provide +true random access to a compressed file/buffer. It works by uncompressing +data from the current offset in the file/buffer until it reaches the +uncompressed offset specified in the parameters to C<seek>. For very small +files this may be acceptable behaviour. For large files it may cause an +unacceptable delay. + The C<$whence> parameter takes one the usual values, namely SEEK_SET, SEEK_CUR or SEEK_END. @@ -720,7 +776,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno @@ -732,7 +788,7 @@ If the C<$z> object is associated with a file or a filehandle, C<fileno> will return the underlying file descriptor. Once the C<close> method is called C<fileno> will return C<undef>. -If the C<$z> object is is associated with a buffer, this method will return +If the C<$z> object is associated with a buffer, this method will return C<undef>. =head2 close @@ -821,13 +877,13 @@ Same as doing this =head2 Working with Net::FTP -See L<IO::Uncompress::Bunzip2::FAQ|IO::Uncompress::Bunzip2::FAQ/"Compressed files and Net::FTP"> +See L<IO::Compress::FAQ|IO::Compress::FAQ/"Compressed files and Net::FTP"> =head1 SEE ALSO -L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress> +L<Compress::Zlib>, L<IO::Compress::Gzip>, L<IO::Uncompress::Gunzip>, L<IO::Compress::Deflate>, L<IO::Uncompress::Inflate>, L<IO::Compress::RawDeflate>, L<IO::Uncompress::RawInflate>, L<IO::Compress::Bzip2>, L<IO::Compress::Lzma>, L<IO::Uncompress::UnLzma>, L<IO::Compress::Xz>, L<IO::Uncompress::UnXz>, L<IO::Compress::Lzop>, L<IO::Uncompress::UnLzop>, L<IO::Compress::Lzf>, L<IO::Uncompress::UnLzf>, L<IO::Uncompress::AnyInflate>, L<IO::Uncompress::AnyUncompress> -L<Compress::Zlib::FAQ|Compress::Zlib::FAQ> +L<IO::Compress::FAQ|IO::Compress::FAQ> L<File::GlobMapper|File::GlobMapper>, L<Archive::Zip|Archive::Zip>, L<Archive::Tar|Archive::Tar>, @@ -847,7 +903,7 @@ See the Changes file. =head1 COPYRIGHT AND LICENSE -Copyright (c) 2005-2008 Paul Marquess. All rights reserved. +Copyright (c) 2005-2013 Paul Marquess. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm index fa9fdcc1d7..b9645fd739 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Gunzip.pm @@ -9,12 +9,12 @@ use strict ; use warnings; use bytes; -use IO::Uncompress::RawInflate 2.061 ; +use IO::Uncompress::RawInflate 2.062 ; -use Compress::Raw::Zlib 2.061 () ; -use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Compress::Gzip::Constants 2.061 ; -use IO::Compress::Zlib::Extra 2.061 ; +use Compress::Raw::Zlib 2.062 () ; +use IO::Compress::Base::Common 2.062 qw(:Status ); +use IO::Compress::Gzip::Constants 2.062 ; +use IO::Compress::Zlib::Extra 2.062 ; require Exporter ; @@ -28,7 +28,7 @@ Exporter::export_ok_tags('all'); $GunzipError = ''; -$VERSION = '2.061'; +$VERSION = '2.062'; sub new { @@ -811,7 +811,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -849,7 +849,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -933,7 +933,7 @@ It is a fatal error to attempt to seek backward. Note that the implementation of C<seek> in this module does not provide true random access to a compressed file/buffer. It works by uncompressing data from the current offset in the file/buffer until it reaches the -ucompressed offset specified in the parameters to C<seek>. For very small +uncompressed offset specified in the parameters to C<seek>. For very small files this may be acceptable behaviour. For large files it may cause an unacceptable delay. @@ -982,7 +982,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm index 7d33d5fa2c..eaaff9aac0 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Inflate.pm @@ -5,15 +5,15 @@ use strict ; use warnings; use bytes; -use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Compress::Zlib::Constants 2.061 ; +use IO::Compress::Base::Common 2.062 qw(:Status ); +use IO::Compress::Zlib::Constants 2.062 ; -use IO::Uncompress::RawInflate 2.061 ; +use IO::Uncompress::RawInflate 2.062 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.061'; +$VERSION = '2.062'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); @@ -699,7 +699,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -737,7 +737,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -805,7 +805,7 @@ It is a fatal error to attempt to seek backward. Note that the implementation of C<seek> in this module does not provide true random access to a compressed file/buffer. It works by uncompressing data from the current offset in the file/buffer until it reaches the -ucompressed offset specified in the parameters to C<seek>. For very small +uncompressed offset specified in the parameters to C<seek>. For very small files this may be acceptable behaviour. For large files it may cause an unacceptable delay. @@ -854,7 +854,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno diff --git a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm index 320186581a..e13b0ec99e 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/RawInflate.pm @@ -5,16 +5,16 @@ use strict ; use warnings; #use bytes; -use Compress::Raw::Zlib 2.061 ; -use IO::Compress::Base::Common 2.061 qw(:Status ); +use Compress::Raw::Zlib 2.062 ; +use IO::Compress::Base::Common 2.062 qw(:Status ); -use IO::Uncompress::Base 2.061 ; -use IO::Uncompress::Adapter::Inflate 2.061 ; +use IO::Uncompress::Base 2.062 ; +use IO::Uncompress::Adapter::Inflate 2.062 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.061'; +$VERSION = '2.062'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -827,7 +827,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -865,7 +865,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -933,7 +933,7 @@ It is a fatal error to attempt to seek backward. Note that the implementation of C<seek> in this module does not provide true random access to a compressed file/buffer. It works by uncompressing data from the current offset in the file/buffer until it reaches the -ucompressed offset specified in the parameters to C<seek>. For very small +uncompressed offset specified in the parameters to C<seek>. For very small files this may be acceptable behaviour. For large files it may cause an unacceptable delay. @@ -982,7 +982,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno diff --git a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm index 1a3474b353..c6c116efaa 100644 --- a/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm +++ b/cpan/IO-Compress/lib/IO/Uncompress/Unzip.pm @@ -9,14 +9,14 @@ use warnings; #use bytes; use IO::File; -use IO::Uncompress::RawInflate 2.061 ; -use IO::Compress::Base::Common 2.061 qw(:Status ); -use IO::Uncompress::Adapter::Inflate 2.061 ; -use IO::Uncompress::Adapter::Identity 2.061 ; -use IO::Compress::Zlib::Extra 2.061 ; -use IO::Compress::Zip::Constants 2.061 ; +use IO::Uncompress::RawInflate 2.062 ; +use IO::Compress::Base::Common 2.062 qw(:Status ); +use IO::Uncompress::Adapter::Inflate 2.062 ; +use IO::Uncompress::Adapter::Identity 2.062 ; +use IO::Compress::Zlib::Extra 2.062 ; +use IO::Compress::Zip::Constants 2.062 ; -use Compress::Raw::Zlib 2.061 () ; +use Compress::Raw::Zlib 2.062 () ; BEGIN { @@ -31,7 +31,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.061'; +$VERSION = '2.062'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -1343,7 +1343,7 @@ specific member from the file, say C<"data1">, use the C<Name> option or die "unzip failed: $UnzipError\n"; Alternatively, if you want to read the C<"data1"> member into memory, use -a scalar reference for the C<output> partameter. +a scalar reference for the C<output> parameter. use strict ; use warnings ; @@ -1526,7 +1526,7 @@ Usage is $status = $z->read($buffer) -Reads a block of compressed data (the size the the compressed block is +Reads a block of compressed data (the size of the compressed block is determined by the C<Buffer> option in the constructor), uncompresses it and writes any uncompressed data into C<$buffer>. If the C<Append> parameter is set in the constructor, the uncompressed data will be appended to the @@ -1564,7 +1564,7 @@ Usage is Reads a single line. -This method fully supports the use of of the variable C<$/> (or +This method fully supports the use of the variable C<$/> (or C<$INPUT_RECORD_SEPARATOR> or C<$RS> when C<English> is in use) to determine what constitutes an end of line. Paragraph mode, record mode and file slurp mode are all supported. @@ -1632,7 +1632,7 @@ It is a fatal error to attempt to seek backward. Note that the implementation of C<seek> in this module does not provide true random access to a compressed file/buffer. It works by uncompressing data from the current offset in the file/buffer until it reaches the -ucompressed offset specified in the parameters to C<seek>. For very small +uncompressed offset specified in the parameters to C<seek>. For very small files this may be acceptable behaviour. For large files it may cause an unacceptable delay. @@ -1681,7 +1681,7 @@ Returns the current uncompressed line number. If C<EXPR> is present it has the effect of setting the line number. Note that setting the line number does not change the current position within the file/buffer being read. -The contents of C<$/> are used to to determine what constitutes a line +The contents of C<$/> are used to determine what constitutes a line terminator. =head2 fileno |