perl.perl5.changes

perl.perl5.changes http://www.nntp.perl.org/group/perl.perl5.changes/ ... Copyright 1998-2008 perl.org Sun, 18 May 2008 13:16:35 +0000 ask@perl.org Change 33854: DEBUG_LEAKING_SCALARS wasn't reporting the correct line number by Dave Mitchell Change 33854 by davem@davem-pigeon on 2008/05/18 12:40:36 DEBUG_LEAKING_SCALARS wasn't reporting the correct line number of SVs allocated at runtime Affected files ... ... //depot/perl/sv.c#1541 edit Differences ... ==== //depot/perl/sv.c#1541 (text) ==== Index: perl/sv.c --- perl/sv.c#1540~33815~ 2008-05-10 12:57:59.000000000 -0700 +++ perl/sv.c 2008-05-18 05:40:36.000000000 -0700 @@ -249,13 +249,12 @@ SvREFCNT(sv) = 1; SvFLAGS(sv) = 0; sv->sv_debug_optype = PL_op ? PL_op->op_type : 0; - sv->sv_debug_line = (U16) (PL_parser - ? PL_parser->copline == NOLINE - ? PL_curcop + sv->sv_debug_line = (U16) (PL_parser && PL_parser->copline != NOLINE + ? PL_parser->copline + : PL_curcop ? CopLINE(PL_curcop) : 0 - : PL_parser->copline - : 0); + ); sv->sv_debug_inpad = 0; sv->sv_debug_cloned = 0; sv->sv_debug_file = PL_curcop ? savepv(CopFILE(PL_curcop)): NULL; End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21690.html Sun, 18 May 2008 05:45:10 +0000 Change 33853: fix misleading comment about Perl_re_dup_guts by Dave Mitchell Change 33853 by davem@davem-pigeon on 2008/05/18 12:07:19 fix misleading comment about Perl_re_dup_guts Affected files ... ... //depot/perl/regcomp.c#654 edit Differences ... ==== //depot/perl/regcomp.c#654 (text) ==== Index: perl/regcomp.c --- perl/regcomp.c#653~33667~ 2008-04-11 05:17:38.000000000 -0700 +++ perl/regcomp.c 2008-05-18 05:07:19.000000000 -0700 @@ -9512,8 +9512,8 @@ /* re_dup - duplicate a regexp. - This routine is expected to clone a given regexp structure. It is not - compiler under USE_ITHREADS. + This routine is expected to clone a given regexp structure. It is only + compiled under USE_ITHREADS. After all of the core data stored in struct regexp is duplicated the regexp_engine.dupe method is used to copy any private data End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21689.html Sun, 18 May 2008 05:15:09 +0000 Change 33852: New separations for the pattern match operator documentation, by Rafael Garcia-Suarez Change 33852 by rgs@scipion on 2008/05/18 08:56:12 New separations for the pattern match operator documentation, suggested by David Nicol: Subject: It's wafer thin! From: "David Nicol" <davidnicol@gmail.com> Date: Fri, 9 May 2008 18:14:29 +0000 Message-ID: <934f64a20805091114y40595f9ap9d355b39f20779c1@mail.gmail.com> Affected files ... ... //depot/perl/pod/perlop.pod#171 edit Differences ... ==== //depot/perl/pod/perlop.pod#171 (text) ==== Index: perl/pod/perlop.pod --- perl/pod/perlop.pod#170~33328~ 2008-02-18 03:10:13.000000000 -0800 +++ perl/pod/perlop.pod 2008-05-18 01:56:12.000000000 -0700 @@ -1151,6 +1151,8 @@ that you won't change the variables in the pattern. If you change them, Perl won't even notice. See also L<"qr/STRING/msixpo">. +=item The empty pattern // + If the PATTERN evaluates to the empty string, the last I<successfully> matched regular expression is used instead. In this case, only the C<g> and C<c> flags on the empty pattern is honoured - @@ -1167,6 +1169,8 @@ use parentheses or spaces to disambiguate, or even prefix the empty regex with an C<m> (so C<//> becomes C<m//>). +=item Matching in list context + If the C</g> option is not used, C<m//> in list context returns a list consisting of the subexpressions matched by the parentheses in the pattern, i.e., (C<$1>, C<$2>, C<$3>...). (Note that here C<$1> etc. are @@ -1213,6 +1217,8 @@ by adding the C</c> modifier (e.g. C<m//gc>). Modifying the target string also resets the search position. +=item \G assertion + You can intermix C<m//g> matches with C<m/\G.../g>, where C<\G> is a zero-width assertion that matches the exact position where the previous C<m//g>, if any, left off. Without the C</g> modifier, the C<\G> assertion End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21688.html Sun, 18 May 2008 02:00:11 +0000 Change 33851: Fix for [perl #51848] Deparse interpolation in regex literal by Rafael Garcia-Suarez Change 33851 by rgs@scipion on 2008/05/18 08:37:02 Fix for [perl #51848] Deparse interpolation in regex literal Affected files ... ... //depot/perl/ext/B/B/Deparse.pm#195 edit ... //depot/perl/ext/B/t/deparse.t#37 edit Differences ... ==== //depot/perl/ext/B/B/Deparse.pm#195 (text) ==== Index: perl/ext/B/B/Deparse.pm --- perl/ext/B/B/Deparse.pm#194~33714~ 2008-04-19 05:08:35.000000000 -0700 +++ perl/ext/B/B/Deparse.pm 2008-05-18 01:37:02.000000000 -0700 @@ -4062,6 +4062,16 @@ return "tr" . double_delim($from, $to) . $flags; } +sub re_dq_disambiguate { + my ($first, $last) = @_; + # Disambiguate "${foo}bar", "${foo}{bar}", "${foo}[1]" + ($last =~ /^[A-Z\\\^\[\]_?]/ && + $first =~ s/([\$@])\^$/${1}{^}/) # "${^}W" etc + || ($last =~ /^[{\[\w_]/ && + $first =~ s/([\$@])([A-Za-z_]\w*)$/${1}{$2}/); + return $first . $last; +} + # Like dq(), but different sub re_dq { my $self = shift; @@ -4077,14 +4087,7 @@ } elsif ($type eq "concat") { my $first = $self->re_dq($op->first, $extended); my $last = $self->re_dq($op->last, $extended); - - # Disambiguate "${foo}bar", "${foo}{bar}", "${foo}[1]" - ($last =~ /^[A-Z\\\^\[\]_?]/ && - $first =~ s/([\$@])\^$/${1}{^}/) # "${^}W" etc - || ($last =~ /^[{\[\w_]/ && - $first =~ s/([\$@])([A-Za-z_]\w*)$/${1}{$2}/); - - return $first . $last; + return re_dq_disambiguate($first, $last); } elsif ($type eq "uc") { return '\U' . $self->re_dq($op->first->sibling, $extended) . '\E'; } elsif ($type eq "lc") { @@ -4156,7 +4159,9 @@ my $str = ''; $kid = $kid->first->sibling; while (!null($kid)) { - $str .= $self->re_dq($kid, $extended); + my $first = $str; + my $last = $self->re_dq($kid, $extended); + $str = re_dq_disambiguate($first, $last); $kid = $kid->sibling; } return $str, 1; ==== //depot/perl/ext/B/t/deparse.t#37 (text) ==== Index: perl/ext/B/t/deparse.t --- perl/ext/B/t/deparse.t#36~33714~ 2008-04-19 05:08:35.000000000 -0700 +++ perl/ext/B/t/deparse.t 2008-05-18 01:37:02.000000000 -0700 @@ -27,7 +27,7 @@ require feature; feature->import(':5.10'); } -use Test::More tests => 60; +use Test::More tests => 61; use B::Deparse; my $deparse = B::Deparse->new(); @@ -416,3 +416,7 @@ elsif ($a and $b) { x(); } elsif ($a or $b) { x(); } else { x(); } +#### +# 54 interpolation in regexps +my($y, $t); +/x${y}z$t/; End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21687.html Sun, 18 May 2008 01:45:10 +0000 Change 33850: [perl #53500] op/pwent.t should use the DirectoryService on OS X by Rafael Garcia-Suarez Change 33850 by rgs@scipion on 2008/05/18 08:00:24 Subject: [perl #53500] op/pwent.t should use the DirectoryService on OS X From: "Tom Wyant via RT" <perlbug-followup@perl.org> Date: Sun, 11 May 2008 14:40:04 -0700 Message-ID: <rt-3.6.HEAD-20841-1210542001-412.53500-15-0@perl.org> Affected files ... ... //depot/perl/t/op/pwent.t#22 edit Differences ... ==== //depot/perl/t/op/pwent.t#22 (xtext) ==== Index: perl/t/op/pwent.t --- perl/t/op/pwent.t#21~32200~ 2007-10-29 03:49:13.000000000 -0700 +++ perl/t/op/pwent.t 2008-05-18 01:00:24.000000000 -0700 @@ -41,6 +41,71 @@ } } + if (not defined $where && # Try dscl + $Config{useperlio} eq 'define') { # need perlio + + # Map dscl items to passwd fields, and provide support for + # mucking with the dscl output if we need to (and we do). + my %want = do { + my $inx = 0; + map {$_ => {inx => $inx++, mung => sub {$_[0]}}} + qw{RecordName Password UniqueID PrimaryGroupID + RealName NFSHomeDirectory UserShell}; + }; + + # The RecordName for a /User record is the username. In some + # cases there are synonyms (e.g. _www and www), in which case we + # get a blank-delimited list. We prefer the first entry in the + # list because getpwnam() does. + $want{RecordName}{mung} = sub {(split '\s+', $_[0], 2)[0]}; + + # The UniqueID and PrimaryGroupID for a /User record are the + # user ID and the primary group ID respectively. In cases where + # the high bit is set, 'dscl' returns a negative number, whereas + # getpwnam() returns its twos complement. This mungs the dscl + # output to agree with what getpwnam() produces. Interestingly + # enough, getpwuid(-2) returns the right record ('nobody'), even + # though it returns the uid as 4294967294. If you track uid_t + # on an i386, you find it is an unsigned int, which makes the + # unsigned version the right one; but both /etc/passwd and + # /etc/master.passwd contain negative numbers. + $want{UniqueID}{mung} = $want{PrimaryGroupID}{mung} = sub { + unpack 'L', pack 'l', $_[0]}; + + foreach my $dscl (qw(/usr/bin/dscl)) { + -x $dscl or next; + open (my $fh, '-|', join (' ', $dscl, qw{. -readall /Users}, + keys %want, '2>/dev/null')) or next; + my $data; + my @rec; + while (<$fh>) { + chomp; + if ($_ eq '-') { + @rec and $data .= join (':', @rec) . "\n"; + @rec = (); + next; + } + my ($name, $value) = split ':\s+', $_, 2; + unless (defined $value) { + s/:$//; + $name = $_; + $value = <$fh>; + chomp $value; + $value =~ s/^\s+//; + } + if (defined (my $info = $want{$name})) { + $rec[$info->{inx}] = $info->{mung}->($value); + } + } + @rec and $data .= join (':', @rec) . "\n"; + if (open (PW, '<', \$data)) { + $where = "dscl . -readall /Users"; + undef $reason; + last; + } + } + } + if (not defined $where) { # Try local. my $PW = "/etc/passwd"; if (-f $PW && open(PW, $PW) && defined(<PW>)) { End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21686.html Sun, 18 May 2008 01:15:09 +0000 Change 33849: [perl #38955] exists(): error message on wrong argument type is incorrect (5.8.7 cygwin) by Rafael Garcia-Suarez Change 33849 by rgs@scipion on 2008/05/18 07:55:44 Subject: [perl #38955] exists(): error message on wrong argument type is incorrect (5.8.7 cygwin) From: "Bram via RT" <perlbug-followup@perl.org> Date: Sat, 17 May 2008 04:14:11 -0700 Message-ID: <rt-3.6.HEAD-11257-1211022849-1634.38955-15-0@perl.org> Affected files ... ... //depot/perl/op.c#1004 edit ... //depot/perl/pod/perldiag.pod#495 edit Differences ... ==== //depot/perl/op.c#1004 (text) ==== Index: perl/op.c --- perl/op.c#1003~33766~ 2008-04-30 01:17:51.000000000 -0700 +++ perl/op.c 2008-05-18 00:55:44.000000000 -0700 @@ -6556,7 +6556,7 @@ else if (kid->op_type == OP_AELEM) o->op_flags |= OPf_SPECIAL; else if (kid->op_type != OP_HELEM) - Perl_croak(aTHX_ "%s argument is not a HASH or ARRAY element", + Perl_croak(aTHX_ "%s argument is not a HASH or ARRAY element or a subroutine", OP_DESC(o)); op_null(kid); } ==== //depot/perl/pod/perldiag.pod#495 (text) ==== Index: perl/pod/perldiag.pod --- perl/pod/perldiag.pod#494~32990~ 2008-01-17 06:23:48.000000000 -0800 +++ perl/pod/perldiag.pod 2008-05-18 00:55:44.000000000 -0700 @@ -131,7 +131,7 @@ (F) msgsnd() requires a string at least as long as sizeof(long). -=item %s argument is not a HASH or ARRAY element +=item %s argument is not a HASH or ARRAY element or a subroutine (F) The argument to exists() must be a hash or array element or a subroutine with an ampersand, such as: End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21685.html Sun, 18 May 2008 01:00:12 +0000 Change 33848: Re: eval "require Foo" with binary-incompatible XS modules by Rafael Garcia-Suarez Change 33848 by rgs@scipion on 2008/05/18 06:28:49 Subject: Re: eval "require Foo" with binary-incompatible XS modules From: Niko Tyni <ntyni@debian.org> Date: Sat, 17 May 2008 21:37:30 +0300 Message-ID: <20080517183730.GA4440@rebekka> Affected files ... ... //depot/perl/pod/perlfunc.pod#601 edit Differences ... ==== //depot/perl/pod/perlfunc.pod#601 (text) ==== Index: perl/pod/perlfunc.pod --- perl/pod/perlfunc.pod#600~33840~ 2008-05-17 03:01:08.000000000 -0700 +++ perl/pod/perlfunc.pod 2008-05-17 23:28:49.000000000 -0700 @@ -1562,6 +1562,10 @@ is implemented. It is also Perl's exception trapping mechanism, where the die operator is used to raise exceptions. +If you want to trap errors when loading an XS module, some problems with +the binary interface (such as Perl version skew) may be fatal even with +C<eval> unless C<$ENV{PERL_DL_NONLAZY}> is set. See L<perlrun>. + If the code to be executed doesn't vary, you may use the eval-BLOCK form to trap run-time errors without incurring the penalty of recompiling each time. The error, if any, is still returned in C<$@>. End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21684.html Sat, 17 May 2008 23:30:10 +0000 Change 33847: [PATCH] Thread::Queue 2.08 by Steve Peters Change 33847 by stevep@stevep-kirk on 2008/05/18 03:35:03 Subject: [PATCH] Thread::Queue 2.08 From: "Jerry D. Hedden" <jdhedden@cpan.org> Date: Wed, 14 May 2008 12:47:04 -0400 Message-ID: <1ff86f510805140947h707fe273j5adec649b5cc4238@mail.gmail.com> Affected files ... ... //depot/perl/lib/Thread/Queue.pm#7 edit ... //depot/perl/lib/Thread/Queue/t/02_refs.t#3 edit Differences ... ==== //depot/perl/lib/Thread/Queue.pm#7 (text) ==== Index: perl/lib/Thread/Queue.pm --- perl/lib/Thread/Queue.pm#6~33808~ 2008-05-10 09:02:24.000000000 -0700 +++ perl/lib/Thread/Queue.pm 2008-05-17 20:35:03.000000000 -0700 @@ -3,19 +3,22 @@ use strict; use warnings; -our $VERSION = '2.07'; +our $VERSION = '2.08'; -use threads::shared 0.96; +use threads::shared 1.21; use Scalar::Util 1.10 qw(looks_like_number blessed reftype refaddr); +# Carp errors from threads::shared calls should complain about caller +our @CARP_NOT = ("threads::shared"); + # Predeclarations for internal functions -my ($make_shared, $validate_count, $validate_index); +my ($validate_count, $validate_index); # Create a new queue possibly pre-populated with items sub new { my $class = shift; - my @queue :shared = map { $make_shared->($_, {}) } @_; + my @queue :shared = map { shared_clone($_) } @_; return bless(\@queue, $class); } @@ -24,7 +27,7 @@ { my $queue = shift; lock(@$queue); - push(@$queue, map { $make_shared->($_, {}) } @_) + push(@$queue, map { shared_clone($_) } @_) and cond_signal(@$queue); } @@ -111,7 +114,7 @@ } # Add new items to the queue - push(@$queue, map { $make_shared->($_, {}) } @_); + push(@$queue, map { shared_clone($_) } @_); # Add previous items back onto the queue push(@$queue, @tmp); @@ -161,98 +164,6 @@ ### Internal Functions ### -# Create a thread-shared version of a complex data structure or object -$make_shared = sub { - my ($item, $cloned) = @_; - - # If not running 'threads' or already thread-shared, - # then just return the input item - return $item if (! $threads::threads || - threads::shared::is_shared($item)); - - # Make copies of array, hash and scalar refs - my $copy; - if (my $ref_type = reftype($item)) { - # Check for previously cloned references - # (this takes care of circular refs as well) - my $addr = refaddr($item); - if (defined($addr) && exists($cloned->{$addr})) { - # Return the already existing clone - return $cloned->{$addr}; - } - - # Copy an array ref - if ($ref_type eq 'ARRAY') { - # Make empty shared array ref - $copy = &share([]); - # Add to clone checking hash - $cloned->{$addr} = $copy; - # Recursively copy and add contents - push(@$copy, map { $make_shared->($_, $cloned) } @$item); - } - - # Copy a hash ref - elsif ($ref_type eq 'HASH') { - # Make empty shared hash ref - $copy = &share({}); - # Add to clone checking hash - $cloned->{$addr} = $copy; - # Recursively copy and add contents - foreach my $key (keys(%{$item})) { - $copy->{$key} = $make_shared->($item->{$key}, $cloned); - } - } - - # Copy a scalar ref - elsif ($ref_type eq 'SCALAR') { - $copy = \do{ my $scalar = $$item; }; - share($copy); - # Clone READONLY flag - if (Internals::SvREADONLY($$item)) { - Internals::SvREADONLY($$copy, 1); - } - # Add to clone checking hash - $cloned->{$addr} = $copy; - } - - # Copy of a ref of a ref - elsif ($ref_type eq 'REF') { - # Special handling for $x = \$x - my $addr2 = refaddr($$item); - if ($addr2 == $addr) { - $copy = \$copy; - share($copy); - $cloned->{$addr} = $copy; - } else { - my $tmp; - $copy = \$tmp; - share($copy); - # Add to clone checking hash - $cloned->{$addr} = $copy; - # Recursively copy and add contents - $tmp = $make_shared->($$item, $cloned); - } - } - } - - # If no copy is created above, then just return the input item - # NOTE: This will end up generating an error for anything - # other than an ordinary scalar - return $item if (! defined($copy)); - - # If input item is an object, then bless the copy into the same class - if (my $class = blessed($item)) { - bless($copy, $class); - } - - # Clone READONLY flag - if (Internals::SvREADONLY($item)) { - Internals::SvREADONLY($copy, 1); - } - - return $copy; -}; - # Check value of the requested index $validate_index = sub { my $index = shift; @@ -291,7 +202,7 @@ =head1 VERSION -This document describes Thread::Queue version 2.07 +This document describes Thread::Queue version 2.08 =head1 SYNOPSIS @@ -544,7 +455,7 @@ L<http://www.cpanforum.com/dist/Thread-Queue> Annotated POD for Thread::Queue: -L<http://annocpan.org/~JDHEDDEN/Thread-Queue-2.07/lib/Thread/Queue.pm> +L<http://annocpan.org/~JDHEDDEN/Thread-Queue-2.08/lib/Thread/Queue.pm> Source repository: L<http://code.google.com/p/thread-queue/> ==== //depot/perl/lib/Thread/Queue/t/02_refs.t#3 (text) ==== Index: perl/lib/Thread/Queue/t/02_refs.t --- perl/lib/Thread/Queue/t/02_refs.t#2~33808~ 2008-05-10 09:02:24.000000000 -0700 +++ perl/lib/Thread/Queue/t/02_refs.t 2008-05-17 20:35:03.000000000 -0700 @@ -23,7 +23,7 @@ require Test::More; } Test::More->import(); -plan('tests' => 45); +plan('tests' => 46); # Regular array my @ary1 = qw/foo bar baz/; @@ -82,14 +82,14 @@ is($q->pending(), 2, 'Queue count'); $q->enqueue($obj1, $obj2); is($q->pending(), 4, 'Queue count'); -$q->enqueue($sref1, $sref2, $qux); -is($q->pending(), 7, 'Queue count'); +$q->enqueue($sref1, $sref2, $foo, $qux); +is($q->pending(), 8, 'Queue count'); $q->enqueue($cir1, $cir1s, $cir2, $cir3); -is($q->pending(), 11, 'Queue count'); +is($q->pending(), 12, 'Queue count'); # Process items in thread threads->create(sub { - is($q->pending(), 11, 'Queue count in thread'); + is($q->pending(), 12, 'Queue count in thread'); my $tary1 = $q->dequeue(); ok($tary1, 'Thread got item'); @@ -132,6 +132,9 @@ is($$tsref2, 69, 'Shared scalar ref contents'); $$tsref2 = 'zzz'; + my $myfoo = $q->dequeue(); + is_deeply($myfoo, $foo, 'Array ref'); + my $qux = $q->dequeue(); is_deeply($$$$qux, $foo, 'Ref of ref'); End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21683.html Sat, 17 May 2008 20:45:11 +0000 Change 33846: [PATCH] IO::Compress::* 2.011 by Steve Peters Change 33846 by stevep@stevep-kirk on 2008/05/18 03:25:54 Subject: [PATCH] IO::Compress::* 2.011 From: "Paul Marquess" <Paul.Marquess@ntlworld.com> Date: Sat, 17 May 2008 12:16:13 +0100 Message-ID: <CF9B8F335CB2417FBA78E0F08EAB1F7D@myopwv.com> Affected files ... ... //depot/perl/MANIFEST#1701 edit ... //depot/perl/ext/Compress/Raw/Zlib/Changes#12 edit ... //depot/perl/ext/Compress/Raw/Zlib/README#16 edit ... //depot/perl/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm#17 edit ... //depot/perl/ext/Compress/Zlib/Changes#24 edit ... //depot/perl/ext/Compress/Zlib/Makefile.PL#27 edit ... //depot/perl/ext/Compress/Zlib/README#25 edit ... //depot/perl/ext/Compress/Zlib/lib/Compress/Zlib.pm#18 edit ... //depot/perl/ext/IO_Compress_Base/Changes#7 edit ... //depot/perl/ext/IO_Compress_Base/README#7 edit ... //depot/perl/ext/IO_Compress_Base/lib/IO/Compress/Base.pm#7 edit ... //depot/perl/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm#7 edit ... //depot/perl/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm#7 edit ... //depot/perl/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/Changes#7 edit ... //depot/perl/ext/IO_Compress_Zlib/Makefile.PL#7 edit ... //depot/perl/ext/IO_Compress_Zlib/README#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm#8 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm#7 edit ... //depot/perl/ext/IO_Compress_Zlib/t/006zip.t#1 add Differences ... ==== //depot/perl/MANIFEST#1701 (text) ==== Index: perl/MANIFEST --- perl/MANIFEST#1700~33836~ 2008-05-16 10:31:30.000000000 -0700 +++ perl/MANIFEST 2008-05-17 20:25:54.000000000 -0700 @@ -750,6 +750,7 @@ ext/IO_Compress_Zlib/t/002any-zip.t IO::Compress::Zlib ext/IO_Compress_Zlib/t/004gziphdr.t IO::Compress::Zlib ext/IO_Compress_Zlib/t/005defhdr.t IO::Compress::Zlib +ext/IO_Compress_Zlib/t/006zip.t IO::Compress::Zlib ext/IO_Compress_Zlib/t/010examples.t IO::Compress::Zlib ext/IO_Compress_Zlib/t/020isize.t IO::Compress::Zlib ext/IO_Compress_Zlib/t/050interop-gzip.t IO::Compress::Zlib ==== //depot/perl/ext/Compress/Raw/Zlib/Changes#12 (text) ==== Index: perl/ext/Compress/Raw/Zlib/Changes --- perl/ext/Compress/Raw/Zlib/Changes#11~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Raw/Zlib/Changes 2008-05-17 20:25:54.000000000 -0700 @@ -1,6 +1,11 @@ CHANGES ------- + 2.011 5 May 2008 + + * A C++-style comment sneaked in with the last update. Fixed. + [core patch #33828] + 2.010 5 May 2008 * No Changes ==== //depot/perl/ext/Compress/Raw/Zlib/README#16 (text) ==== Index: perl/ext/Compress/Raw/Zlib/README --- perl/ext/Compress/Raw/Zlib/README#15~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Raw/Zlib/README 2008-05-17 20:25:54.000000000 -0700 @@ -1,9 +1,9 @@ Compress-Raw-Zlib - Version 2.010 + Version 2.011 - 5th May 2008 + 17th May 2008 Copyright (c) 2005-2008 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -326,7 +326,7 @@ If you haven't installed Compress-Raw-Zlib then search Compress::Raw::Zlib.pm for a line like this: - $VERSION = "2.010" ; + $VERSION = "2.011" ; c. The version of zlib you have used. If you have successfully installed Compress-Raw-Zlib, this one-liner ==== //depot/perl/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm#17 (text) ==== Index: perl/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm --- perl/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm#16~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Raw/Zlib/lib/Compress/Raw/Zlib.pm 2008-05-17 20:25:54.000000000 -0700 @@ -13,7 +13,7 @@ use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.010'; +$VERSION = '2.011'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; ==== //depot/perl/ext/Compress/Zlib/Changes#24 (text) ==== Index: perl/ext/Compress/Zlib/Changes --- perl/ext/Compress/Zlib/Changes#23~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Zlib/Changes 2008-05-17 20:25:54.000000000 -0700 @@ -1,6 +1,10 @@ CHANGES ------- + 2.011 17 May 2008 + + * No Changes + 2.010 5 May 2008 * Fixed problem that meant Perl 5.10 could not upgrade this module. ==== //depot/perl/ext/Compress/Zlib/Makefile.PL#27 (xtext) ==== Index: perl/ext/Compress/Zlib/Makefile.PL --- perl/ext/Compress/Zlib/Makefile.PL#26~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Zlib/Makefile.PL 2008-05-17 20:25:54.000000000 -0700 @@ -3,7 +3,7 @@ use strict ; require 5.004 ; -$::VERSION = '2.010' ; +$::VERSION = '2.011' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; ==== //depot/perl/ext/Compress/Zlib/README#25 (text) ==== Index: perl/ext/Compress/Zlib/README --- perl/ext/Compress/Zlib/README#24~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Zlib/README 2008-05-17 20:25:54.000000000 -0700 @@ -1,9 +1,9 @@ Compress-Zlib - Version 2.010 + Version 2.011 - 5th May 2008 + 17th May 2008 Copyright (c) 1995-2008 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -106,7 +106,7 @@ If you haven't installed Compress-Zlib then search Compress::Zlib.pm for a line like this: - $VERSION = "2.010" ; + $VERSION = "2.011" ; 2. If you are having problems building Compress-Zlib, send me a complete log of what happened. Start by unpacking the Compress-Zlib ==== //depot/perl/ext/Compress/Zlib/lib/Compress/Zlib.pm#18 (text) ==== Index: perl/ext/Compress/Zlib/lib/Compress/Zlib.pm --- perl/ext/Compress/Zlib/lib/Compress/Zlib.pm#17~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/Compress/Zlib/lib/Compress/Zlib.pm 2008-05-17 20:25:54.000000000 -0700 @@ -8,17 +8,17 @@ use IO::Handle ; use Scalar::Util qw(dualvar); -use IO::Compress::Base::Common 2.010 ; -use Compress::Raw::Zlib 2.010 ; -use IO::Compress::Gzip 2.010 ; -use IO::Uncompress::Gunzip 2.010 ; +use IO::Compress::Base::Common 2.011 ; +use Compress::Raw::Zlib 2.011 ; +use IO::Compress::Gzip 2.011 ; +use IO::Uncompress::Gunzip 2.011 ; use strict ; use warnings ; use bytes ; our ($VERSION, $XS_VERSION, @ISA, @EXPORT, $AUTOLOAD); -$VERSION = '2.010'; +$VERSION = '2.011'; $XS_VERSION = $VERSION; $VERSION = eval $VERSION; @@ -452,7 +452,7 @@ package Compress::Zlib ; -use IO::Compress::Gzip::Constants 2.010 ; +use IO::Compress::Gzip::Constants 2.011 ; sub memGzip($) { ==== //depot/perl/ext/IO_Compress_Base/Changes#7 (text) ==== Index: perl/ext/IO_Compress_Base/Changes --- perl/ext/IO_Compress_Base/Changes#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Base/Changes 2008-05-17 20:25:54.000000000 -0700 @@ -1,6 +1,18 @@ CHANGES ------- + 2.011 17 May 2008 + + * IO::Compress::Base + - Fixed problem that prevented the creation of a zip file that + contained more than one compression method. + + * IO::Compress::Base::Common + - The private Validator class in this module clashes with another + CPAN module. Moved Validator into the IO::Compress::Base::Common + namespace. + [RT #35954] + 2.010 5 May 2008 * Fixed problem that meant Perl 5.10 could not upgrade this module. ==== //depot/perl/ext/IO_Compress_Base/README#7 (text) ==== Index: perl/ext/IO_Compress_Base/README --- perl/ext/IO_Compress_Base/README#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Base/README 2008-05-17 20:25:54.000000000 -0700 @@ -1,9 +1,9 @@ IO-Compress-Base - Version 2.010 + Version 2.011 - 5th May 2008 + 17th May 2008 Copyright (c) 2005-2008 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -76,7 +76,7 @@ If you haven't installed IO-Compress-Base then search IO::Compress::Base.pm for a line like this: - $VERSION = "2.010" ; + $VERSION = "2.011" ; 2. If you are having problems building IO-Compress-Base, send me a complete log of what happened. Start by unpacking the IO-Compress-Base ==== //depot/perl/ext/IO_Compress_Base/lib/IO/Compress/Base.pm#7 (text) ==== Index: perl/ext/IO_Compress_Base/lib/IO/Compress/Base.pm --- perl/ext/IO_Compress_Base/lib/IO/Compress/Base.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Base/lib/IO/Compress/Base.pm 2008-05-17 20:25:54.000000000 -0700 @@ -6,7 +6,7 @@ use strict ; use warnings; -use IO::Compress::Base::Common 2.010 ; +use IO::Compress::Base::Common 2.011 ; use IO::File ; use Scalar::Util qw(blessed readonly); @@ -20,7 +20,7 @@ our (@ISA, $VERSION); @ISA = qw(Exporter IO::File); -$VERSION = '2.010'; +$VERSION = '2.011'; #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. @@ -236,7 +236,7 @@ my $status ; if (! $merge) { - *$obj->{Compress} = $obj->mkComp($class, $got) + *$obj->{Compress} = $obj->mkComp($got) or return undef; *$obj->{UnCompSize} = new U64 ; @@ -323,7 +323,7 @@ my $haveOut = @_ ; my $output = shift ; - my $x = new Validator($class, *$obj->{Error}, $name, $input, $output) + my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output) or return undef ; push @_, $output if $haveOut && $x->{Hash}; @@ -699,15 +699,13 @@ $self->ckParams($got) or $self->croakError("newStream: $self->{Error}"); + *$self->{Compress} = $self->mkComp($got) + or return 0; + *$self->{Header} = $self->mkHeader($got) ; $self->output(*$self->{Header} ) or return 0; - my $status = $self->reset() ; - return $self->saveErrorString(0, *$self->{Compress}{Error}, - *$self->{Compress}{ErrorNo}) - if $status == STATUS_ERROR; - *$self->{UnCompSize}->reset(); *$self->{CompSize}->reset(); @@ -977,3 +975,4 @@ This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. + ==== //depot/perl/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm#7 (text) ==== Index: perl/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm --- perl/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Base/lib/IO/Compress/Base/Common.pm 2008-05-17 20:25:54.000000000 -0700 @@ -11,7 +11,7 @@ require Exporter; our ($VERSION, @ISA, @EXPORT, %EXPORT_TAGS, $HAS_ENCODE); @ISA = qw(Exporter); -$VERSION = '2.010'; +$VERSION = '2.011'; @EXPORT = qw( isaFilehandle isaFilename whatIsInput whatIsOutput isaFileGlobString cleanFileGlobString oneTarget @@ -192,7 +192,7 @@ return $_[0] =~ /^(code|handle|buffer|filename)$/; } -sub Validator::new +sub IO::Compress::Base::Validator::new { my $class = shift ; @@ -320,7 +320,7 @@ return $obj ; } -sub Validator::saveErrorString +sub IO::Compress::Base::Validator::saveErrorString { my $self = shift ; ${ $self->{Error} } = shift ; @@ -328,7 +328,7 @@ } -sub Validator::croakError +sub IO::Compress::Base::Validator::croakError { my $self = shift ; $self->saveErrorString($_[0]); @@ -337,7 +337,7 @@ -sub Validator::validateInputFilenames +sub IO::Compress::Base::Validator::validateInputFilenames { my $self = shift ; @@ -367,7 +367,7 @@ return 1 ; } -sub Validator::validateInputArray +sub IO::Compress::Base::Validator::validateInputArray { my $self = shift ; @@ -398,7 +398,7 @@ return 1 ; } -#sub Validator::validateHash +#sub IO::Compress::Base::Validator::validateHash #{ # my $self = shift ; # my $href = shift ; ==== //depot/perl/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm#7 (text) ==== Index: perl/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm --- perl/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Base/lib/IO/Uncompress/AnyUncompress.pm 2008-05-17 20:25:54.000000000 -0700 @@ -4,16 +4,16 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject); -use IO::Uncompress::Base 2.010 ; +use IO::Uncompress::Base 2.011 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyUncompressError); -$VERSION = '2.010'; +$VERSION = '2.011'; $AnyUncompressError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -27,18 +27,18 @@ BEGIN { - eval ' use IO::Uncompress::Adapter::Inflate 2.010 ;'; - eval ' use IO::Uncompress::Adapter::Bunzip2 2.010 ;'; - eval ' use IO::Uncompress::Adapter::LZO 2.010 ;'; - eval ' use IO::Uncompress::Adapter::Lzf 2.010 ;'; - - eval ' use IO::Uncompress::Bunzip2 2.010 ;'; - eval ' use IO::Uncompress::UnLzop 2.010 ;'; - eval ' use IO::Uncompress::Gunzip 2.010 ;'; - eval ' use IO::Uncompress::Inflate 2.010 ;'; - eval ' use IO::Uncompress::RawInflate 2.010 ;'; - eval ' use IO::Uncompress::Unzip 2.010 ;'; - eval ' use IO::Uncompress::UnLzf 2.010 ;'; + eval ' use IO::Uncompress::Adapter::Inflate 2.011 ;'; + eval ' use IO::Uncompress::Adapter::Bunzip2 2.011 ;'; + eval ' use IO::Uncompress::Adapter::LZO 2.011 ;'; + eval ' use IO::Uncompress::Adapter::Lzf 2.011 ;'; + + eval ' use IO::Uncompress::Bunzip2 2.011 ;'; + eval ' use IO::Uncompress::UnLzop 2.011 ;'; + eval ' use IO::Uncompress::Gunzip 2.011 ;'; + eval ' use IO::Uncompress::Inflate 2.011 ;'; + eval ' use IO::Uncompress::RawInflate 2.011 ;'; + eval ' use IO::Uncompress::Unzip 2.011 ;'; + eval ' use IO::Uncompress::UnLzf 2.011 ;'; } sub new @@ -56,7 +56,7 @@ sub getExtraParams { - use IO::Compress::Base::Common 2.010 qw(:Parse); + use IO::Compress::Base::Common 2.011 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; } @@ -75,7 +75,6 @@ sub mkUncomp { my $self = shift ; - my $class = shift ; my $got = shift ; my $magic ; ==== //depot/perl/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm#7 (text) ==== Index: perl/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm --- perl/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Base/lib/IO/Uncompress/Base.pm 2008-05-17 20:25:54.000000000 -0700 @@ -9,12 +9,12 @@ @ISA = qw(Exporter IO::File); -$VERSION = '2.010'; +$VERSION = '2.011'; use constant G_EOF => 0 ; use constant G_ERR => -1 ; -use IO::Compress::Base::Common 2.010 ; +use IO::Compress::Base::Common 2.011 ; #use Parse::Parameters ; use IO::File ; @@ -468,7 +468,7 @@ return $obj } - my $status = $obj->mkUncomp($class, $got); + my $status = $obj->mkUncomp($got); return undef unless defined $status; @@ -533,7 +533,7 @@ my $output = shift ; - my $x = new Validator($class, *$obj->{Error}, $name, $input, $output) + my $x = new IO::Compress::Base::Validator($class, *$obj->{Error}, $name, $input, $output) or return undef ; push @_, $output if $haveOut && $x->{Hash}; @@ -1451,3 +1451,4 @@ This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself. + ==== //depot/perl/ext/IO_Compress_Zlib/Changes#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/Changes --- perl/ext/IO_Compress_Zlib/Changes#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/Changes 2008-05-17 20:25:54.000000000 -0700 @@ -1,6 +1,16 @@ CHANGES ------- + 2.011 17 May 2008 + + * IO::Uncompress::Unzip + - Print an error message if the zip file contains a + member compressed with bzip2 and IO::Uncompress::Bunzip2 is + not available. + - Could not cope with mixed compression zip files. For example a + zip file that contains both STORED and DEFLATED content. + [RT #35573] + 2.010 5 May 2008 * Fixed problem that meant Perl 5.10 could not upgrade this module. ==== //depot/perl/ext/IO_Compress_Zlib/Makefile.PL#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/Makefile.PL --- perl/ext/IO_Compress_Zlib/Makefile.PL#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/Makefile.PL 2008-05-17 20:25:54.000000000 -0700 @@ -3,7 +3,7 @@ use strict ; require 5.004 ; -$::VERSION = '2.010' ; +$::VERSION = '2.011' ; use private::MakeUtil; use ExtUtils::MakeMaker 5.16 ; ==== //depot/perl/ext/IO_Compress_Zlib/README#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/README --- perl/ext/IO_Compress_Zlib/README#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/README 2008-05-17 20:25:54.000000000 -0700 @@ -1,9 +1,9 @@ IO-Compress-Zlib - Version 2.010 + Version 2.011 - 5th May 2008 + 17th May 2008 Copyright (c) 2005-2008 Paul Marquess. All rights reserved. This program is free software; you can redistribute it @@ -93,7 +93,7 @@ If you haven't installed IO-Compress-Zlib then search IO::Compress::Gzip.pm for a line like this: - $VERSION = "2.010" ; + $VERSION = "2.011" ; 2. If you are having problems building IO-Compress-Zlib, send me a complete log of what happened. Start by unpacking the IO-Compress-Zlib ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Deflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -4,12 +4,12 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(:Status); +use IO::Compress::Base::Common 2.011 qw(:Status); -use Compress::Raw::Zlib 2.010 qw(Z_OK Z_FINISH MAX_WBITS) ; +use Compress::Raw::Zlib 2.011 qw(Z_OK Z_FINISH MAX_WBITS) ; our ($VERSION); -$VERSION = '2.010'; +$VERSION = '2.011'; sub mkCompObject { ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Adapter/Identity.pm 2008-05-17 20:25:54.000000000 -0700 @@ -4,10 +4,10 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(:Status); +use IO::Compress::Base::Common 2.011 qw(:Status); our ($VERSION); -$VERSION = '2.010'; +$VERSION = '2.011'; sub mkCompObject { ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Deflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -6,16 +6,16 @@ require Exporter ; -use IO::Compress::RawDeflate 2.010 ; +use IO::Compress::RawDeflate 2.011 ; -use Compress::Raw::Zlib 2.010 ; -use IO::Compress::Zlib::Constants 2.010 ; -use IO::Compress::Base::Common 2.010 qw(createSelfTiedObject); +use Compress::Raw::Zlib 2.011 ; +use IO::Compress::Zlib::Constants 2.011 ; +use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject); our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $DeflateError); -$VERSION = '2.010'; +$VERSION = '2.011'; $DeflateError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip.pm 2008-05-17 20:25:54.000000000 -0700 @@ -8,12 +8,12 @@ use bytes; -use IO::Compress::RawDeflate 2.010 ; +use IO::Compress::RawDeflate 2.011 ; -use Compress::Raw::Zlib 2.010 ; -use IO::Compress::Base::Common 2.010 qw(:Status :Parse createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.010 ; -use IO::Compress::Zlib::Extra 2.010 ; +use Compress::Raw::Zlib 2.011 ; +use IO::Compress::Base::Common 2.011 qw(:Status :Parse createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.011 ; +use IO::Compress::Zlib::Extra 2.011 ; BEGIN { @@ -27,7 +27,7 @@ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $GzipError); -$VERSION = '2.010'; +$VERSION = '2.011'; $GzipError = '' ; @ISA = qw(Exporter IO::Compress::RawDeflate); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm#8 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm#7~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Gzip/Constants.pm 2008-05-17 20:25:54.000000000 -0700 @@ -9,7 +9,7 @@ our ($VERSION, @ISA, @EXPORT, %GZIP_OS_Names); our ($GZIP_FNAME_INVALID_CHAR_RE, $GZIP_FCOMMENT_INVALID_CHAR_RE); -$VERSION = '2.010'; +$VERSION = '2.011'; @ISA = qw(Exporter); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/RawDeflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -7,16 +7,16 @@ use bytes; -use IO::Compress::Base 2.010 ; -use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject); -use IO::Compress::Adapter::Deflate 2.010 ; +use IO::Compress::Base 2.011 ; +use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject); +use IO::Compress::Adapter::Deflate 2.011 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %DEFLATE_CONSTANTS, %EXPORT_TAGS, $RawDeflateError); -$VERSION = '2.010'; +$VERSION = '2.011'; $RawDeflateError = ''; @ISA = qw(Exporter IO::Compress::Base); @@ -92,7 +92,6 @@ sub mkComp { my $self = shift ; - my $class = shift ; my $got = shift ; my ($obj, $errstr, $errno) = IO::Compress::Adapter::Deflate::mkCompObject( @@ -143,8 +142,8 @@ { my $self = shift ; - use IO::Compress::Base::Common 2.010 qw(:Parse); - use Compress::Raw::Zlib 2.010 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.011 qw(:Parse); + use Compress::Raw::Zlib 2.011 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); return ( ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip.pm 2008-05-17 20:25:54.000000000 -0700 @@ -4,21 +4,21 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject); -use IO::Compress::RawDeflate 2.010 ; -use IO::Compress::Adapter::Deflate 2.010 ; -use IO::Compress::Adapter::Identity 2.010 ; -use IO::Compress::Zlib::Extra 2.010 ; -use IO::Compress::Zip::Constants 2.010 ; +use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject); +use IO::Compress::RawDeflate 2.011 ; +use IO::Compress::Adapter::Deflate 2.011 ; +use IO::Compress::Adapter::Identity 2.011 ; +use IO::Compress::Zlib::Extra 2.011 ; +use IO::Compress::Zip::Constants 2.011 ; -use Compress::Raw::Zlib 2.010 qw(crc32) ; +use Compress::Raw::Zlib 2.011 qw(crc32) ; BEGIN { eval { require IO::Compress::Adapter::Bzip2 ; - import IO::Compress::Adapter::Bzip2 2.010 ; + import IO::Compress::Adapter::Bzip2 2.011 ; require IO::Compress::Bzip2 ; - import IO::Compress::Bzip2 2.010 ; + import IO::Compress::Bzip2 2.011 ; } ; } @@ -27,7 +27,7 @@ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $ZipError); -$VERSION = '2.010'; +$VERSION = '2.011'; $ZipError = ''; @ISA = qw(Exporter IO::Compress::RawDeflate); @@ -57,7 +57,6 @@ sub mkComp { my $self = shift ; - my $class = shift ; my $got = shift ; my ($obj, $errstr, $errno) ; @@ -453,8 +452,8 @@ { my $self = shift ; - use IO::Compress::Base::Common 2.010 qw(:Parse); - use Compress::Raw::Zlib 2.010 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); + use IO::Compress::Base::Common 2.011 qw(:Parse); + use Compress::Raw::Zlib 2.011 qw(Z_DEFLATED Z_DEFAULT_COMPRESSION Z_DEFAULT_STRATEGY); my @Bzip2 = (); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zip/Constants.pm 2008-05-17 20:25:54.000000000 -0700 @@ -7,7 +7,7 @@ our ($VERSION, @ISA, @EXPORT, %ZIP_CM_MIN_VERSIONS); -$VERSION = '2.010'; +$VERSION = '2.011'; @ISA = qw(Exporter); @@ -33,6 +33,7 @@ ZIP_GP_FLAG_PATCHED_MASK ZIP_GP_FLAG_STRONG_ENCRYPTED_MASK ZIP_GP_FLAG_LZMA_EOS_PRESENT + ZIP_GP_FLAG_LANGUAGE_ENCODING ZIP_EXTRA_ID_ZIP64 ZIP_EXTRA_ID_EXT_TIMESTAMP @@ -83,6 +84,7 @@ use constant ZIP_EXTRA_ID_ZIP64 => pack "v", 1; use constant ZIP_EXTRA_ID_EXT_TIMESTAMP => "UT"; use constant ZIP_EXTRA_ID_INFO_ZIP_UNIX2 => "Ux"; +use constant ZIP_EXTRA_ID_JAVA_EXE => pack "v", 0xCAFE; use constant ZIP64_MIN_VERSION => 45; ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Constants.pm 2008-05-17 20:25:54.000000000 -0700 @@ -9,7 +9,7 @@ our ($VERSION, @ISA, @EXPORT); -$VERSION = '2.010'; +$VERSION = '2.011'; @ISA = qw(Exporter); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Compress/Zlib/Extra.pm 2008-05-17 20:25:54.000000000 -0700 @@ -8,9 +8,9 @@ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS); -$VERSION = '2.010'; +$VERSION = '2.011'; -use IO::Compress::Gzip::Constants 2.010 ; +use IO::Compress::Gzip::Constants 2.011 ; sub ExtraFieldError { ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Identity.pm 2008-05-17 20:25:54.000000000 -0700 @@ -4,13 +4,13 @@ use strict; use bytes; -use IO::Compress::Base::Common 2.010 qw(:Status); +use IO::Compress::Base::Common 2.011 qw(:Status); our ($VERSION); -$VERSION = '2.010'; +$VERSION = '2.011'; -use Compress::Raw::Zlib 2.010 (); +use Compress::Raw::Zlib 2.011 (); sub mkUncompObject { ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Adapter/Inflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -4,11 +4,11 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(:Status); -use Compress::Raw::Zlib 2.010 qw(Z_OK Z_DATA_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); +use IO::Compress::Base::Common 2.011 qw(:Status); +use Compress::Raw::Zlib 2.011 qw(Z_OK Z_DATA_ERROR Z_STREAM_END Z_FINISH MAX_WBITS); our ($VERSION); -$VERSION = '2.010'; +$VERSION = '2.011'; ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/AnyInflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -6,22 +6,22 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(createSelfTiedObject); +use IO::Compress::Base::Common 2.011 qw(createSelfTiedObject); -use IO::Uncompress::Adapter::Inflate 2.010 (); +use IO::Uncompress::Adapter::Inflate 2.011 (); -use IO::Uncompress::Base 2.010 ; -use IO::Uncompress::Gunzip 2.010 ; -use IO::Uncompress::Inflate 2.010 ; -use IO::Uncompress::RawInflate 2.010 ; -use IO::Uncompress::Unzip 2.010 ; +use IO::Uncompress::Base 2.011 ; +use IO::Uncompress::Gunzip 2.011 ; +use IO::Uncompress::Inflate 2.011 ; +use IO::Uncompress::RawInflate 2.011 ; +use IO::Uncompress::Unzip 2.011 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $AnyInflateError); -$VERSION = '2.010'; +$VERSION = '2.011'; $AnyInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -48,7 +48,7 @@ sub getExtraParams { - use IO::Compress::Base::Common 2.010 qw(:Parse); + use IO::Compress::Base::Common 2.011 qw(:Parse); return ( 'RawInflate' => [1, 1, Parse_boolean, 0] ) ; } @@ -67,7 +67,6 @@ sub mkUncomp { my $self = shift ; - my $class = shift ; my $got = shift ; my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::Inflate::mkUncompObject(); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Gunzip.pm 2008-05-17 20:25:54.000000000 -0700 @@ -9,12 +9,12 @@ use warnings; use bytes; -use IO::Uncompress::RawInflate 2.010 ; +use IO::Uncompress::RawInflate 2.011 ; -use Compress::Raw::Zlib 2.010 qw( crc32 ) ; -use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject); -use IO::Compress::Gzip::Constants 2.010 ; -use IO::Compress::Zlib::Extra 2.010 ; +use Compress::Raw::Zlib 2.011 qw( crc32 ) ; +use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject); +use IO::Compress::Gzip::Constants 2.011 ; +use IO::Compress::Zlib::Extra 2.011 ; require Exporter ; @@ -28,7 +28,7 @@ $GunzipError = ''; -$VERSION = '2.010'; +$VERSION = '2.011'; sub new { @@ -47,7 +47,7 @@ sub getExtraParams { - use IO::Compress::Base::Common 2.010 qw(:Parse); + use IO::Compress::Base::Common 2.011 qw(:Parse); return ( 'ParseExtra' => [1, 1, Parse_boolean, 0] ) ; } ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Inflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -5,15 +5,15 @@ use warnings; use bytes; -use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject); -use IO::Compress::Zlib::Constants 2.010 ; +use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject); +use IO::Compress::Zlib::Constants 2.011 ; -use IO::Uncompress::RawInflate 2.010 ; +use IO::Uncompress::RawInflate 2.011 ; require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $InflateError); -$VERSION = '2.010'; +$VERSION = '2.011'; $InflateError = ''; @ISA = qw( Exporter IO::Uncompress::RawInflate ); ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/RawInflate.pm 2008-05-17 20:25:54.000000000 -0700 @@ -5,11 +5,11 @@ use warnings; use bytes; -use Compress::Raw::Zlib 2.010 ; -use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject); +use Compress::Raw::Zlib 2.011 ; +use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject); -use IO::Uncompress::Base 2.010 ; -use IO::Uncompress::Adapter::Inflate 2.010 ; +use IO::Uncompress::Base 2.011 ; +use IO::Uncompress::Adapter::Inflate 2.011 ; @@ -17,7 +17,7 @@ require Exporter ; our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, %DEFLATE_CONSTANTS, $RawInflateError); -$VERSION = '2.010'; +$VERSION = '2.011'; $RawInflateError = ''; @ISA = qw( Exporter IO::Uncompress::Base ); @@ -58,7 +58,6 @@ sub mkUncomp { my $self = shift ; - my $class = shift ; my $got = shift ; my ($obj, $errstr, $errno) = IO::Uncompress::Adapter::Inflate::mkUncompObject( ==== //depot/perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm#7 (text) ==== Index: perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm --- perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm#6~33816~ 2008-05-10 13:04:34.000000000 -0700 +++ perl/ext/IO_Compress_Zlib/lib/IO/Uncompress/Unzip.pm 2008-05-17 20:25:54.000000000 -0700 @@ -8,13 +8,14 @@ use warnings; use bytes; -use IO::Uncompress::RawInflate 2.010 ; -use IO::Compress::Base::Common 2.010 qw(:Status createSelfTiedObject); -use IO::Uncompress::Adapter::Identity 2.010 ; -use IO::Compress::Zlib::Extra 2.010 ; -use IO::Compress::Zip::Constants 2.010 ; +use IO::Uncompress::RawInflate 2.011 ; +use IO::Compress::Base::Common 2.011 qw(:Status createSelfTiedObject); +use IO::Uncompress::Adapter::Inflate 2.011 ; +use IO::Uncompress::Adapter::Identity 2.011 ; +use IO::Compress::Zlib::Extra 2.011 ; +use IO::Compress::Zip::Constants 2.011 ; -use Compress::Raw::Zlib 2.010 qw(crc32) ; +use Compress::Raw::Zlib 2.011 qw(crc32) ; BEGIN { @@ -27,7 +28,7 @@ our ($VERSION, @ISA, @EXPORT_OK, %EXPORT_TAGS, $UnzipError, %headerLookup); -$VERSION = '2.010'; +$VERSION = '2.011'; $UnzipError = ''; @ISA = qw(Exporter IO::Uncompress::RawInflate); @@ -60,7 +61,7 @@ sub getExtraParams { - use IO::Compress::Base::Common 2.010 qw(:Parse); + use IO::Compress::Base::Common 2.011 qw(:Parse); return ( @@ -84,6 +85,20 @@ return 1; } +sub mkUncomp +{ + my $self = shift ; + my $got = shift ; + + my $magic = $self->ckMagic() + or return 0; + + *$self->{Info} = $self->readHeader($magic) + or return undef ; + + return 1; + +} sub ckMagic { @@ -585,19 +600,22 @@ if ($compressedMethod == ZIP_CM_DEFLATE) { *$self->{Type} = 'zip-deflate'; + my $obj = IO::Uncompress::Adapter::Inflate::mkUncompObject(1,0,0); + + *$self->{Uncomp} = $obj; + *$self->{ZipData}{CRC32} = crc32(undef); } elsif ($compressedMethod == ZIP_CM_BZIP2) { - #if (! defined $IO::Uncompress::Adapter::Bunzip2::VERSION) + return $self->HeaderError("Unsupported Compression format $compressedMethod") + if ! defined $IO::Uncompress::Adapter::Bunzip2::VERSION ; *$self->{Type} = 'zip-bzip2'; - my $obj = IO::Uncompress::Adapter::Bunzip2::mkUncompObject( - ); + my $obj = IO::Uncompress::Adapter::Bunzip2::mkUncompObject(); *$self->{Uncomp} = $obj; *$self->{ZipData}{CRC32} = crc32(undef); - } elsif ($compressedMethod == ZIP_CM_STORE) { @@ -605,12 +623,9 @@ *$self->{Type} = 'zip-stored'; - my $obj = IO::Uncompress::Adapter::Identity::mkUncompObject(# $got->value('CRC32'), - # $got->value('ADLER32'), - ); + my $obj = IO::Uncompress::Adapter::Identity::mkUncompObject(); *$self->{Uncomp} = $obj; - } else { @@ -1402,9 +1417,11 @@ my $zipfile = "somefile.zip"; my $u = new IO::Uncompress::Unzip $zipfile - or die "Cannot open $filefile: $UnzipError"; + or die "Cannot open $zipfile: $UnzipError"; - for (my $status = 1; ! $u->eof(); $status = $u->nextStream()) + my $status; + for ($status = 1; ! $u->eof(); $status = $u->nextStream()) + { my $name = $u->getHeaderInfo()->{Name}; warn "Processing member $name\n" ; ==== //depot/perl/ext/IO_Compress_Zlib/t/006zip.t#1 (text) ==== Index: perl/ext/IO_Compress_Zlib/t/006zip.t --- /dev/null 2008-05-07 15:08:24.549929899 -0700 +++ perl/ext/IO_Compress_Zlib/t/006zip.t 2008-05-17 20:25:54.000000000 -0700 @@ -0,0 +1,251 @@ +BEGIN { + if ($ENV{PERL_CORE}) { + chdir 't' if -d 't'; + @INC = ("../lib", "lib/compress"); + } +} + +use lib qw(t t/compress); +use strict; +use warnings; +use bytes; + +use Test::More ; +use CompTestUtils; + +BEGIN { + # use Test::NoWarnings, if available + my $extra = 0 ; + $extra = 1 + if eval { require Test::NoWarnings ; import Test::NoWarnings; 1 }; + + plan tests => 62 + $extra ; + + use_ok('IO::Compress::Zip', qw(:all)) ; + use_ok('IO::Uncompress::Unzip', qw(unzip $UnzipError)) ; + + eval { + require IO::Compress::Bzip2 ; + import IO::Compress::Bzip2 2.010 ; + require IO::Uncompress::Bunzip2 ; + import IO::Uncompress::Bunzip2 2.010 ; + } ; + +} + + +sub getContent +{ + my $filename = shift; + + my $u = new IO::Uncompress::Unzip $filename, Append => 1 + or die "Cannot open $filename: $UnzipError"; + + isa_ok $u, "IO::Uncompress::Unzip"; + + my @content; + my $status ; + + for ($status = 1; ! $u->eof(); $status = $u->nextStream()) + { + + my $name = $u->getHeaderInfo()->{Name}; + #warn "Processing member $name\n" ; + + my $buff = ''; + 1 while ($status = $u->read($buff)) > 0; + + push @content, $buff; + last unless $status == 0; + } + + die "Error processing $filename: $status $!\n" + if $status < 0 ; + + return @content; +} + + +{ + title "Create a simple zip - All Deflate"; + + my $lex = new LexFile my $file1; + + my @content = ( + 'hello', + '', + 'goodbye ', + ); + + my $zip = new IO::Compress::Zip $file1, + Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0; + isa_ok $zip, "IO::Compress::Zip"; + + is $zip->write($content[0]), length($content[0]), "write"; + $zip->newStream(Name=> "two", Method => ZIP_CM_DEFLATE); + is $zip->write($content[1]), length($content[1]), "write"; + $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE); + is $zip->write($content[2]), length($content[2]), "write"; + ok $zip->close(), "closed"; + + my @got = getContent($file1); + + is $got[0], $content[0], "Got 1st entry"; + is $got[1], $content[1], "Got 2nd entry"; + is $got[2], $content[2], "Got 3nd entry"; +} + +SKIP: +{ + title "Create a simple zip - All Bzip2"; + + skip "IO::Compress::Bzip2 not available", 9 + unless defined $IO::Compress::Bzip2::VERSION; + + my $lex = new LexFile my $file1; + + my @content = ( + 'hello', + '', + 'goodbye ', + ); + + my $zip = new IO::Compress::Zip $file1, + Name => "one", Method => ZIP_CM_BZIP2, Stream => 0; + isa_ok $zip, "IO::Compress::Zip"; + + is $zip->write($content[0]), length($content[0]), "write"; + $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2); + is $zip->write($content[1]), length($content[1]), "write"; + $zip->newStream(Name=> "three", Method => ZIP_CM_BZIP2); + is $zip->write($content[2]), length($content[2]), "write"; + ok $zip->close(), "closed"; + + my @got = getContent($file1); + + is $got[0], $content[0], "Got 1st entry"; + is $got[1], $content[1], "Got 2nd entry"; + is $got[2], $content[2], "Got 3nd entry"; +} + +SKIP: +{ + title "Create a simple zip - Deflate + Bzip2"; + + skip "IO::Compress::Bzip2 not available", 9 + unless $IO::Compress::Bzip2::VERSION; + + my $lex = new LexFile my $file1; + + my @content = ( + 'hello', + 'and', + 'goodbye ', + ); + + my $zip = new IO::Compress::Zip $file1, + Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0; + isa_ok $zip, "IO::Compress::Zip"; + + is $zip->write($content[0]), length($content[0]), "write"; + $zip->newStream(Name=> "two", Method => ZIP_CM_BZIP2); + is $zip->write($content[1]), length($content[1]), "write"; + $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE); + is $zip->write($content[2]), length($content[2]), "write"; + ok $zip->close(), "closed"; + + my @got = getContent($file1); + + is $got[0], $content[0], "Got 1st entry"; + is $got[1], $content[1], "Got 2nd entry"; + is $got[2], $content[2], "Got 3nd entry"; +} + +{ + title "Create a simple zip - All STORE"; + + my $lex = new LexFile my $file1; + + my @content = ( + 'hello', + '', + 'goodbye ', + ); + + my $zip = new IO::Compress::Zip $file1, + Name => "one", Method => ZIP_CM_STORE, Stream => 0; + isa_ok $zip, "IO::Compress::Zip"; + + is $zip->write($content[0]), length($content[0]), "write"; + $zip->newStream(Name=> "two", Method => ZIP_CM_STORE); + is $zip->write($content[1]), length($content[1]), "write"; + $zip->newStream(Name=> "three", Method => ZIP_CM_STORE); + is $zip->write($content[2]), length($content[2]), "write"; + ok $zip->close(), "closed"; + + my @got = getContent($file1); + + is $got[0], $content[0], "Got 1st entry"; + is $got[1], $content[1], "Got 2nd entry"; + is $got[2], $content[2], "Got 3nd entry"; +} + +{ + title "Create a simple zip - Deflate + STORE"; + + #my $lex = new LexFile my $file1; + my $file1 = "tryout.zip"; + + my @content = qw( + hello + and + goodbye + ); + + my $zip = new IO::Compress::Zip $file1, + Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0; + isa_ok $zip, "IO::Compress::Zip"; + + is $zip->write($content[0]), length($content[0]), "write"; + $zip->newStream(Name=> "two", Method => ZIP_CM_STORE); + is $zip->write($content[1]), length($content[1]), "write"; + $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE); + is $zip->write($content[2]), length($content[2]), "write"; + ok $zip->close(), "closed"; + + my @got = getContent($file1); + + is $got[0], $content[0], "Got 1st entry"; + is $got[1], $content[1], "Got 2nd entry"; + is $got[2], $content[2], "Got 3nd entry"; +} + +{ + title "Create a simple zip - Deflate + zero length STORE"; + + my $lex = new LexFile my $file1; + + my @content = ( + 'hello ', + '', + 'goodbye ', + ); + + my $zip = new IO::Compress::Zip $file1, + Name => "one", Method => ZIP_CM_DEFLATE, Stream => 0; + isa_ok $zip, "IO::Compress::Zip"; + + is $zip->write($content[0]), length($content[0]), "write"; + $zip->newStream(Name=> "two", Method => ZIP_CM_STORE); + is $zip->write($content[1]), length($content[1]), "write"; + $zip->newStream(Name=> "three", Method => ZIP_CM_DEFLATE); + is $zip->write($content[2]), length($content[2]), "write"; + ok $zip->close(), "closed"; + + my @got = getContent($file1); + + is $got[0], $content[0], "Got 1st entry"; + ok $got[1] eq $content[1], "Got 2nd entry"; + is $got[2], $content[2], "Got 3nd entry"; +} + End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21682.html Sat, 17 May 2008 20:30:29 +0000 Change 33845: [PATCH] Re: [perl #50180] NDBM_File fails to build by H . Merijn Brand Change 33845 by merijn@merijn-nb09 on 2008/05/17 14:29:24 Subject: [PATCH] Re: [perl #50180] NDBM_File fails to build From: Andy Dougherty <doughera@lafayette.edu> Date: Tue, 13 May 2008 12:28:45 -0400 (EDT) Message-ID: <Pine.LNX.4.64.0805131224130.9728@fractal.phys.lafayette.edu> Affected files ... ... //depot/perl/Configure#691 edit ... //depot/perl/Porting/Glossary#190 edit ... //depot/perl/config_h.SH#345 edit ... //depot/perl/ext/NDBM_File/NDBM_File.xs#17 edit ... //depot/perl/hints/linux.sh#66 edit Differences ... ==== //depot/perl/Configure#691 (xtext) ==== Index: perl/Configure --- perl/Configure#690~33843~ 2008-05-17 06:56:26.000000000 -0700 +++ perl/Configure 2008-05-17 07:29:24.000000000 -0700 @@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Sat May 17 15:55:21 CEST 2008 [metaconfig 3.5 PL0] +# Generated on Sat May 17 16:03:30 CEST 2008 [metaconfig 3.5 PL0] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -873,6 +873,9 @@ i_math='' i_memory='' i_mntent='' +d_ndbm='' +i_gdbm_ndbm='' +i_gdbmndbm='' i_ndbm='' i_netdb='' i_neterrno='' @@ -20818,37 +20821,32 @@ eval $inhdr : see if ndbm.h is available -set ndbm.h t_ndbm +set ndbm.h i_ndbm +eval $inhdr +: Compatibility location for RedHat 7.1 +set gdbm/ndbm.h i_gdbmndbm +eval $inhdr +: Compatibility location for Debian 4.0 +set gdbm-ndbm.h i_gdbm_ndbm eval $inhdr -case "$t_ndbm" in -$undef) - # Some Linux distributions such as RedHat 7.1 put the - # ndbm.h header in /usr/include/gdbm/ndbm.h. - if $test -f /usr/include/gdbm/ndbm.h; then - echo '<gdbm/ndbm.h> found.' - ccflags="$ccflags -I/usr/include/gdbm" - cppflags="$cppflags -I/usr/include/gdbm" - t_ndbm=$define - fi - ;; -esac - -case "$t_ndbm" in -$define) +if $test "$i_ndbm" = "$define" -o "$i_gdbmndbm" = "$define" -o "$i_gdbm_ndbm" = "$define"; then : see if dbm_open exists set dbm_open d_dbm_open eval $inlibc case "$d_dbm_open" in $undef) - t_ndbm="$undef" + i_ndbm="$undef" + i_gdbmndbm="$undef" + i_gdbm_ndbm="$undef" echo "We won't be including <ndbm.h>" + val="$undef" ;; + *) val="$define" + ;; esac - ;; -esac -val="$t_ndbm" -set i_ndbm +fi +set d_ndbm eval $setvar : see if net/errno.h is available @@ -21674,7 +21672,7 @@ ;; *) case "$usedl" in $define|true|[yY]*) - set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` + set X `echo " $libs " | sed -e 's@ -lndbm @ @' -e 's@ -lgdbm @ @' -e 's@ -lgdbm_compat @ @' -e 's@ -ldbm @ @' -e 's@ -ldb @ @'` shift perllibs="$*" ;; @@ -22074,6 +22072,7 @@ d_msync='$d_msync' d_munmap='$d_munmap' d_mymalloc='$d_mymalloc' +d_ndbm='$d_ndbm' d_nice='$d_nice' d_nl_langinfo='$d_nl_langinfo' d_nv_preserves_uv='$d_nv_preserves_uv' @@ -22373,6 +22372,8 @@ i_fp='$i_fp' i_fp_class='$i_fp_class' i_gdbm='$i_gdbm' +i_gdbm_ndbm='$i_gdbm_ndbm' +i_gdbmndbm='$i_gdbmndbm' i_grp='$i_grp' i_ieeefp='$i_ieeefp' i_inttypes='$i_inttypes' ==== //depot/perl/Porting/Glossary#190 (text) ==== Index: perl/Porting/Glossary --- perl/Porting/Glossary#189~33598~ 2008-03-29 04:21:46.000000000 -0700 +++ perl/Porting/Glossary 2008-05-17 07:29:24.000000000 -0700 @@ -1429,6 +1429,14 @@ of the source want to take special action if MYMALLOC is used. This may include different sorts of profiling or error detection. +d_ndbm (i_ndbm.U): + This variable conditionally defines the HAS_NDBM symbol, which + indicates that both the ndbm.h include file and an appropriate ndbm + library exist. Consult the different i_*ndbm variables + to find out the actual include location. Sometimes, a system has the + header file but not the library. This variable will only be set if + the system has both. + d_nice (d_nice.U): This variable conditionally defines the HAS_NICE symbol, which indicates to the C program that the nice() routine is available. @@ -2886,6 +2894,18 @@ indicates to the C program that <gdbm.h> exists and should be included. +i_gdbm_ndbm (i_ndbm.U): + This variable conditionally defines the I_GDBM_NDBM symbol, which + indicates to the C program that <gdbm-ndbm.h> exists and should + be included. This is the location of the ndbm.h compatibility file + in Debian 4.0. + +i_gdbmndbm (i_ndbm.U): + This variable conditionally defines the I_GDBMNDBM symbol, which + indicates to the C program that <gdbm/ndbm.h> exists and should + be included. This was the location of the ndbm.h compatibility file + in RedHat 7.1. + i_grp (i_grp.U): This variable conditionally defines the I_GRP symbol, and indicates whether a C program should include <grp.h>. ==== //depot/perl/config_h.SH#345 (text) ==== Index: perl/config_h.SH --- perl/config_h.SH#344~33598~ 2008-03-29 04:21:46.000000000 -0700 +++ perl/config_h.SH 2008-05-17 07:29:24.000000000 -0700 @@ -689,12 +689,6 @@ */ #$i_locale I_LOCALE /**/ -/* I_MALLOCMALLOC: - * This symbol, if defined, indicates to the C program that it should - * include <malloc/malloc.h>. - */ -#$i_mallocmalloc I_MALLOCMALLOC /**/ - /* I_MATH: * This symbol, if defined, indicates to the C program that it should * include <math.h>. @@ -4109,6 +4103,12 @@ */ #$i_libutil I_LIBUTIL /**/ +/* I_MALLOCMALLOC: + * This symbol, if defined, indicates to the C program that it should + * include <malloc/malloc.h>. + */ +#$i_mallocmalloc I_MALLOCMALLOC /**/ + /* I_MNTENT: * This symbol, if defined, indicates that <mntent.h> exists and * should be included. ==== //depot/perl/ext/NDBM_File/NDBM_File.xs#17 (text) ==== Index: perl/ext/NDBM_File/NDBM_File.xs --- perl/ext/NDBM_File/NDBM_File.xs#16~28996~ 2006-10-11 07:48:45.000000000 -0700 +++ perl/ext/NDBM_File/NDBM_File.xs 2008-05-17 07:29:24.000000000 -0700 @@ -1,7 +1,13 @@ #include "EXTERN.h" #include "perl.h" #include "XSUB.h" +#if defined(I_GDBM_NDBM) +# include <gdbm-ndbm.h> /* Debian compatibility version */ +#elif defined(I_GDBMNDBM) +# include <gdbm/ndbm.h> /* RedHat compatibility version */ +#elif defined(I_NDBM) #include <ndbm.h> +#endif typedef struct { DBM * dbp ; ==== //depot/perl/hints/linux.sh#66 (text) ==== Index: perl/hints/linux.sh --- perl/hints/linux.sh#65~31404~ 2007-06-17 07:48:11.000000000 -0700 +++ perl/hints/linux.sh 2008-05-17 07:29:24.000000000 -0700 @@ -54,6 +54,9 @@ shift libswanted="$*" +# Debian 4.0 puts ndbm in the -lgdbm_compat library. +libswanted="$libswanted gdbm_compat" + # If you have glibc, then report the version for ./myconfig bug reporting. # (Configure doesn't need to know the specific version since it just uses # gcc to load the library for all tests.) End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21681.html Sat, 17 May 2008 07:30:22 +0000 Change 33843: [perl #54120] [PATCH] [metaconfig] Need more -fstack-protector by H . Merijn Brand Change 33843 by merijn@merijn-nb09 on 2008/05/17 13:56:26 Subject: [perl #54120] [PATCH] [metaconfig] Need more -fstack-protector From: Andy Dougherty (via RT) <perlbug-followup@perl.org> Date: Tue, 13 May 2008 09:37:07 -0700 Message-ID: <rt-3.6.HEAD-9992-1210696625-331.54120-75-0@perl.org> Affected files ... ... //depot/perl/Configure#690 edit Differences ... ==== //depot/perl/Configure#690 (xtext) ==== Index: perl/Configure --- perl/Configure#689~33631~ 2008-04-02 11:46:13.000000000 -0700 +++ perl/Configure 2008-05-17 06:56:26.000000000 -0700 @@ -25,7 +25,7 @@ # $Id: Head.U 6 2006-08-25 22:21:46Z rmanfredi $ # -# Generated on Wed Apr 2 20:45:31 CEST 2008 [metaconfig 3.5 PL0] +# Generated on Sat May 17 15:55:21 CEST 2008 [metaconfig 3.5 PL0] # (with additional metaconfig patches by perlbug@perl.org) cat >c1$$ <<EOF @@ -5119,7 +5119,7 @@ # as that way the compiler can do the right implementation dependant # thing. (NWC) case "$gccversion" in - ?*) set stack-protector -fstack-protector 'ldflags="$ldflags -fstack-protector"' + ?*) set stack-protector -fstack-protector eval $checkccflag ;; esac @@ -5258,6 +5258,10 @@ case "$ccflags" in *-posix*) dflt="$dflt -posix" ;; esac + # See note above about -fstack-protector + case "$ccflags" in + *-fstack-protector*) dflt="$dflt -fstack-protector" ;; + esac ;; *) dflt="$ldflags";; esac @@ -8023,6 +8027,16 @@ ''|' ') dflt='none' ;; esac + case "$ldflags" in + *-fstack-protector*) + case "$dflt" in + *-fstack-protector*) ;; # Don't add it again + *) dflt="$dflt -fstack-protector" ;; + esac + ;; + esac + + rp="Any special flags to pass to $ld to create a dynamically loaded library?" . ./myread case "$ans" in End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21680.html Sat, 17 May 2008 07:00:14 +0000 Change 33841: [PATCH] Re: Compiling perl (5.10.x) with gcc <= 3.2.3 by H . Merijn Brand Change 33841 by merijn@merijn-nb09 on 2008/05/17 13:48:16 Subject: [PATCH] Re: Compiling perl (5.10.x) with gcc <= 3.2.3 From: Andy Dougherty <doughera@lafayette.edu> Date: Fri, 16 May 2008 13:59:41 -0400 (EDT) Message-ID: <Pine.LNX.4.64.0805161344570.10409@fractal.phys.lafayette.edu> Affected files ... ... //depot/perl/INSTALL#190 edit Differences ... ==== //depot/perl/INSTALL#190 (text) ==== Index: perl/INSTALL --- perl/INSTALL#189~32646~ 2007-12-19 05:48:45.000000000 -0800 +++ perl/INSTALL 2008-05-17 06:48:16.000000000 -0700 @@ -1886,6 +1886,13 @@ tries to exercise the regular expression subsystem quite thoroughly, and may well be far more demanding than your normal usage. +=item libgcc_s.so.1: cannot open shared object file + +This message has been reported on gcc-3.2.3 and earlier installed with +a non-standard prefix. Setting the LD_LIBRARY_PATH environment variable +(or equivalent) to include gcc's lib/ directory with the libgcc_s.so.1 +shared library should fix the problem. + =item Failures from lib/File/Temp/t/security saying "system possibly insecure" First, such warnings are not necessarily serious or indicative of a End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21679.html Sat, 17 May 2008 07:00:10 +0000 Change 33840: [perl #39187] [DOC-PATCH]: perldoc -f reverse: examples (was: RE: Perlfunc needs to be made more clear regarding reverse in scalar context.) by Yves Orton Change 33840 by demerphq@demerphq-gemini on 2008/05/17 10:01:08 Subject: [perl #39187] [DOC-PATCH]: perldoc -f reverse: examples (was: RE: Perlfunc needs to be made more clear regarding reverse in scalar context.) From: "Bram via RT" <perlbug-followup@perl.org> Date: Fri, 16 May 2008 14:44:07 -0700 Message-ID: <rt-3.6.HEAD-9880-1210974244-1717.39187-15-0@perl.org> Affected files ... ... //depot/perl/pod/perlfunc.pod#600 edit Differences ... ==== //depot/perl/pod/perlfunc.pod#600 (text) ==== Index: perl/pod/perlfunc.pod --- perl/pod/perlfunc.pod#599~33834~ 2008-05-16 05:17:03.000000000 -0700 +++ perl/pod/perlfunc.pod 2008-05-17 03:01:08.000000000 -0700 @@ -4718,13 +4718,16 @@ elements of LIST and returns a string value with all characters in the opposite order. - print reverse <>; # line tac, last line first + print join(", ", reverse "world", "Hello"); # Hello, world - undef $/; # for efficiency of <> - print scalar reverse <>; # character tac, last line tsrif + print scalar reverse "dlrow ,", "olleH"; # Hello, world Used without arguments in scalar context, reverse() reverses C<$_>. + $_ = "dlrow ,olleH"; + print reverse; # No output, list context + print scalar reverse; # Hello, world + This operator is also handy for inverting a hash, although there are some caveats. If a value is duplicated in the original hash, only one of those can be represented as a key in the inverted hash. Also, this has to End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21678.html Sat, 17 May 2008 03:15:10 +0000 Change 33839: Somehow, this got missed in change #33779. by Steve Peters Change 33839 by stevep@stevep-kirk on 2008/05/16 19:58:58 Somehow, this got missed in change #33779. Affected files ... ... //depot/perl/ext/Digest/SHA/lib/Digest/SHA.pm#2 edit Differences ... ==== //depot/perl/ext/Digest/SHA/lib/Digest/SHA.pm#2 (text) ==== Index: perl/ext/Digest/SHA/lib/Digest/SHA.pm --- perl/ext/Digest/SHA/lib/Digest/SHA.pm#1~33779~ 2008-05-02 07:26:59.000000000 -0700 +++ perl/ext/Digest/SHA/lib/Digest/SHA.pm 2008-05-16 12:58:58.000000000 -0700 @@ -6,7 +6,7 @@ use integer; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK); -$VERSION = '5.46'; +$VERSION = '5.47'; require Exporter; require DynaLoader; @@ -499,9 +499,9 @@ The "p" mode is handy since it ensures that the digest value of I<$filename> will be the same when computed on different operating -systems. It accomplishes this by internally translating all newlines -in text files to UNIX format before calculating the digest; on the other -hand, binary files are read in raw mode with no translation whatsoever. +systems. It accomplishes this by internally translating all newlines in +text files to UNIX format before calculating the digest. Binary files +are read in raw mode with no translation whatsoever. For a fuller discussion of newline formats, refer to CPAN module L<File::LocalizeNewlines>. Its "universal line separator" regex forms @@ -640,6 +640,7 @@ Gisle Aas Chris Carey + Alexandr Ciornii Jim Doble Julius Duque Jeffrey Friedl End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21677.html Fri, 16 May 2008 13:00:15 +0000 Change 33838: Upgrade to ExtUtils-Command-1.14 by Steve Peters Change 33838 by stevep@stevep-kirk on 2008/05/16 19:53:42 Upgrade to ExtUtils-Command-1.14 Affected files ... ... //depot/perl/lib/ExtUtils/Command.pm#30 edit Differences ... ==== //depot/perl/lib/ExtUtils/Command.pm#30 (text) ==== Index: perl/lib/ExtUtils/Command.pm --- perl/lib/ExtUtils/Command.pm#29~30146~ 2007-02-06 13:43:13.000000000 -0800 +++ perl/lib/ExtUtils/Command.pm 2008-05-16 12:53:42.000000000 -0700 @@ -12,7 +12,7 @@ @ISA = qw(Exporter); @EXPORT = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod dos2unix); -$VERSION = '1.13'; +$VERSION = '1.14'; my $Is_VMS = $^O eq 'VMS'; End of Patch. http://www.nntp.perl.org/group/perl.perl5.changes/2008/05/msg21676.html Fri, 16 May 2008 13:00:11 +0000 Change 33837: Upgrade to Math-BigInt-FastCalc-0.19 by Steve Peters Change 33837 by stevep@stevep-kirk on 2008/05/16 18:07:00 Upgrade to Math-BigInt-FastCalc-0.19 Affected files ... ... //depot/perl/ext/Math/BigInt/FastCalc/FastCalc.pm#11 edit ... //depot/perl/ext/Math/BigInt/FastCalc/FastCalc.xs#10 edit ... //depot/perl/ext/Math/BigInt/FastCalc/t/bigintfc.t#4 edit ... //depot/perl/ext/Math/BigInt/FastCalc/t/bootstrap.t#2 edit Differences ... ==== //depot/perl/ext/Math/BigInt/FastCalc/FastCalc.pm#11 (text) ==== Index: perl/ext/Math/BigInt/FastCalc/FastCalc.pm --- perl/ext/Math/BigInt/FastCalc/FastCalc.pm#10~31875~ 2007-09-16 03:48:40.000000000 -0700 +++ perl/ext/Math/BigInt/FastCalc/FastCalc.pm 2008-05-16 11:07:00.000000000 -0700 @@ -11,7 +11,7 @@ @ISA = qw(DynaLoader); -$VERSION = '0.16'; +$VERSION = '0.19'; bootstrap Math::BigInt::FastCalc $VERSION; @@ -60,6 +60,7 @@ 1; __END__ +=pod =head1 NAME ==== //depot/perl/ext/Math/BigInt/FastCalc/FastCalc.xs#10 (text) ==== Index: perl/ext/Math/BigInt/FastCalc/FastCalc.xs --- perl/ext/Math/BigInt/FastCalc/FastCalc.xs#9~31608~ 2007-07-13 05:13:09.000000000 -0700 +++ perl/ext/Math/BigInt/FastCalc/FastCalc.xs 2008-05-16 11:07:00.000000000 -0700 @@ -2,6 +2,11 @@ #include "perl.h" #include "XSUB.h" +/* for Perl prior to v5.7.1 */ +#ifndef SvUOK +# define SvUOK(sv) SvIOK_UV(sv) +#endif + double XS_BASE = 0; double XS_BASE_LEN = 0; @@ -61,7 +66,7 @@ /* create the array */ RETVAL = newAV(); sv_2mortal((SV*)RETVAL); - if (SvIOK(x) && SvUV(x) < XS_BASE) + if (SvUOK(x) && SvUV(x) < XS_BASE) { /* shortcut for integer arguments */ av_push (RETVAL, newSVuv( SvUV(x) )); @@ -112,7 +117,7 @@ a = (AV*)SvRV(x); /* ref to aray, don't check ref */ elems = av_len(a); /* number of elems in array */ a2 = (AV*)sv_2mortal((SV*)newAV()); - av_extend (a2, elems); /* prepadd */ + av_extend (a2, elems); /* pre-padd */ while (elems >= 0) { /* av_store( a2, elems, newSVsv( (SV*)*av_fetch(a, elems, 0) ) ); */ @@ -201,7 +206,7 @@ while (index <= elems) { temp = *av_fetch(a, index, 0); /* fetch ptr to current element */ - sv_setnv (temp, SvNV(temp)-1); + sv_setnv (temp, SvNV(temp)-1); /* decrement */ if (SvNV(temp) >= 0) {