Change 34701 by [EMAIL PROTECTED] on 2008/11/03 10:35:59
Integrate:
[ 34692]
Integrate:
[ 34691]
Upgrade to Text::ParseWords 3.27
Affected files ...
... //depot/maint-5.8/perl/Porting/Maintainers.pl#46 integrate
... //depot/maint-5.8/perl/lib/Text/ParseWords.pm#10 integrate
... //depot/maint-5.8/perl/lib/Text/ParseWords.t#6 integrate
... //depot/maint-5.8/perl/lib/Text/ParseWords/taint.t#2 integrate
Differences ...
==== //depot/maint-5.8/perl/Porting/Maintainers.pl#46 (text) ====
Index: perl/Porting/Maintainers.pl
--- perl/Porting/Maintainers.pl#45~34636~ 2008-10-29 09:03:41.000000000
-0700
+++ perl/Porting/Maintainers.pl 2008-11-03 02:35:59.000000000 -0800
@@ -17,6 +17,7 @@
'arandal' => 'Allison Randal <[EMAIL PROTECTED]>',
'audreyt' => 'Audrey Tang <[EMAIL PROTECTED]>',
'avar' => 'Ævar Arnfjörð Bjarmason <[EMAIL PROTECTED]>',
+ 'chorny' => "Alexandr Ciornii <alexchorny\100gmail.com>",
'craig' => 'Craig Berry <[EMAIL PROTECTED]>',
'dankogai' => 'Dan Kogai <[EMAIL PROTECTED]>',
'dconway' => 'Damian Conway <[EMAIL PROTECTED]>',
@@ -733,6 +734,13 @@
'CPAN' => 1,
},
+ 'Text::ParseWords' =>
+ {
+ 'MAINTAINER' => 'chorny',
+ 'FILES' => q[lib/Text/ParseWords{.pm,.t,}],
+ 'CPAN' => 1,
+ },
+
'Text::Soundex' =>
{
'MAINTAINER' => 'markm',
==== //depot/maint-5.8/perl/lib/Text/ParseWords.pm#10 (text) ====
Index: perl/lib/Text/ParseWords.pm
--- perl/lib/Text/ParseWords.pm#9~32455~ 2007-11-22 14:07:11.000000000
-0800
+++ perl/lib/Text/ParseWords.pm 2008-11-03 02:35:59.000000000 -0800
@@ -1,14 +1,15 @@
package Text::ParseWords;
-use vars qw($VERSION @ISA @EXPORT $PERL_SINGLE_QUOTE);
-$VERSION = "3.26";
+use strict;
+require 5.006;
+our $VERSION = "3.27";
-require 5.000;
use Exporter;
[EMAIL PROTECTED] = qw(Exporter);
[EMAIL PROTECTED] = qw(shellwords quotewords nested_quotewords parse_line);
[EMAIL PROTECTED] = qw(old_shellwords);
+our @ISA = qw(Exporter);
+our @EXPORT = qw(shellwords quotewords nested_quotewords parse_line);
+our @EXPORT_OK = qw(old_shellwords);
+our $PERL_SINGLE_QUOTE;
sub shellwords {
@@ -181,11 +182,11 @@
=head1 SYNOPSIS
use Text::ParseWords;
- @lists = &nested_quotewords($delim, $keep, @lines);
- @words = "ewords($delim, $keep, @lines);
- @words = &shellwords(@lines);
- @words = &parse_line($delim, $keep, $line);
- @words = &old_shellwords(@lines); # DEPRECATED!
+ @lists = nested_quotewords($delim, $keep, @lines);
+ @words = quotewords($delim, $keep, @lines);
+ @words = shellwords(@lines);
+ @words = parse_line($delim, $keep, $line);
+ @words = old_shellwords(@lines); # DEPRECATED!
=head1 DESCRIPTION
@@ -222,7 +223,7 @@
The sample program:
use Text::ParseWords;
- @words = "ewords('\s+', 0, q{this is "a test" of\ quotewords \"for
you});
+ @words = quotewords('\s+', 0, q{this is "a test" of\ quotewords \"for
you});
$i = 0;
foreach (@words) {
print "$i: <$_>\n";
@@ -269,13 +270,15 @@
=back
-Replacing C<"ewords('\s+', 0, q{this is...})>
-with C<&shellwords(q{this is...})>
+Replacing C<quotewords('\s+', 0, q{this is...})>
+with C<shellwords(q{this is...})>
is a simpler way to accomplish the same thing.
=head1 AUTHORS
-Maintainer is Hal Pomeranz <[EMAIL PROTECTED]>, 1994-1997 (Original
+Maintainer: Alexandr Ciornii <alexchornyATgmail.com>.
+
+Previous maintainer: Hal Pomeranz <[EMAIL PROTECTED]>, 1994-1997 (Original
author unknown). Much of the code for &parse_line() (including the
primary regexp) from Joerk Behrends <[EMAIL PROTECTED]>.
==== //depot/maint-5.8/perl/lib/Text/ParseWords.t#6 (xtext) ====
Index: perl/lib/Text/ParseWords.t
--- perl/lib/Text/ParseWords.t#5~30539~ 2007-03-10 10:15:47.000000000 -0800
+++ perl/lib/Text/ParseWords.t 2008-11-03 02:35:59.000000000 -0800
@@ -1,125 +1,129 @@
-#!./perl
-
-BEGIN {
- chdir 't' if -d 't';
- @INC = '../lib';
-}
-
-use warnings;
-use Text::ParseWords;
-use Test::More tests => 27;
-
[EMAIL PROTECTED] = shellwords(qq(foo "bar quiz" zoo));
-is($words[0], 'foo');
-is($words[1], 'bar quiz');
-is($words[2], 'zoo');
-
-{
- # Gonna get some undefined things back
- no warnings 'uninitialized' ;
-
- # Test quotewords() with other parameters and null last field
- @words = quotewords(':+', 1, 'foo:::"bar:foo":zoo zoo:');
- is(join(";", @words), qq(foo;"bar:foo";zoo zoo;));
-}
-
-# Test $keep eq 'delimiters' and last field zero
[EMAIL PROTECTED] = quotewords('\s+', 'delimiters', '4 3 2 1 0');
-is(join(";", @words), qq(4; ;3; ;2; ;1; ;0));
-
-# Big ol' nasty test (thanks, Joerk!)
-$string = 'aaaa"bbbbb" cc\\ cc \\\\\\"dddd" eee\\\\\\"ffff" "gg"';
-
-# First with $keep == 1
-$result = join('|', parse_line('\s+', 1, $string));
-is($result, 'aaaa"bbbbb"|cc\\ cc|\\\\\\"dddd" eee\\\\\\"ffff"|"gg"');
-
-# Now, $keep == 0
-$result = join('|', parse_line('\s+', 0, $string));
-is($result, 'aaaabbbbb|cc cc|\\"dddd eee\\"ffff|gg');
-
-# Now test single quote behavior
-$string = 'aaaa"bbbbb" cc\\ cc \\\\\\"dddd\' eee\\\\\\"ffff\' gg';
-$result = join('|', parse_line('\s+', 0, $string));
-is($result, 'aaaabbbbb|cc cc|\\"dddd eee\\\\\\"ffff|gg');
-
-# Make sure @nested_quotewords does the right thing
[EMAIL PROTECTED] = nested_quotewords('\s+', 0, 'a b c', '1 2 3', 'x y z');
-is (@lists, 3);
-is (@{$lists[0]}, 3);
-is (@{$lists[1]}, 3);
-is (@{$lists[2]}, 3);
-
-# Now test error return
-$string = 'foo bar baz"bach blech boop';
-
[EMAIL PROTECTED] = shellwords($string);
-is(@words, 0);
-
[EMAIL PROTECTED] = parse_line('s+', 0, $string);
-is(@words, 0);
-
[EMAIL PROTECTED] = quotewords('s+', 0, $string);
-is(@words, 0);
-
-{
- # Gonna get some more undefined things back
- no warnings 'uninitialized' ;
-
- @words = nested_quotewords('s+', 0, $string);
- is(@words, 0);
-
- # Now test empty fields
- $result = join('|', parse_line(':', 0, 'foo::0:"":::'));
- is($result, 'foo||0||||');
-
- # Test for 0 in quotes without $keep
- $result = join('|', parse_line(':', 0, ':"0":'));
- is($result, '|0|');
-
- # Test for \001 in quoted string
- $result = join('|', parse_line(':', 0, ':"' . "\001" . '":'));
- is($result, "|\1|");
-
-}
-
-# Now test perlish single quote behavior
-$Text::ParseWords::PERL_SINGLE_QUOTE = 1;
-$string = 'aaaa"bbbbb" cc\ cc \\\\\"dddd\' eee\\\\\"\\\'ffff\' gg';
-$result = join('|', parse_line('\s+', 0, $string));
-is($result, 'aaaabbbbb|cc cc|\"dddd eee\\\\"\'ffff|gg');
-
-# test whitespace in the delimiters
[EMAIL PROTECTED] = quotewords(' ', 1, '4 3 2 1 0');
-is(join(";", @words), qq(4;3;2;1;0));
-
-# [perl #30442] Text::ParseWords does not handle backslashed newline inside
quoted text
-$string = qq{"field1" "field2\\\nstill field2" "field3"};
-
-$result = join('|', parse_line("\t", 1, $string));
-is($result, qq{"field1"|"field2\\\nstill field2"|"field3"});
-
-$result = join('|', parse_line("\t", 0, $string));
-is($result, "field1|field2\nstill field2|field3");
-
-# unicode
-$string = qq{"field1"\x{1234}"field2\\\x{1234}still field2"\x{1234}"field3"};
-$result = join('|', parse_line("\x{1234}", 0, $string));
-is($result, "field1|field2\x{1234}still field2|field3");
-
-# missing quote after matching regex used to hang after change #22997
-"1234" =~ /(1)(2)(3)(4)/;
-$string = qq{"missing quote};
-$result = join('|', shellwords($string));
-is($result, "");
-
-# make sure shellwords strips out leading whitespace and trailng undefs
-# from parse_line, so it's behavior is more like /bin/sh
-$result = join('|', shellwords(" aa \\ \\ bb ", " \\ ", "cc dd ee\\ "));
-is($result, "aa| | bb| |cc|dd|ee ");
-
-$SIG{ALRM} = sub {die "Timeout!"};
-alarm(3);
[EMAIL PROTECTED] = Text::ParseWords::old_shellwords("foo\\");
-is(@words, 1);
-alarm(0);
+#!./perl
+
+BEGIN {
+ if( $ENV{PERL_CORE} ) {
+ chdir 't' if -d 't';
+ @INC = '../lib';
+ }
+}
+
+use warnings;
+use Text::ParseWords;
+use Test::More tests => 27;
+
[EMAIL PROTECTED] = shellwords(qq(foo "bar quiz" zoo));
+is($words[0], 'foo');
+is($words[1], 'bar quiz');
+is($words[2], 'zoo');
+
+{
+ # Gonna get some undefined things back
+ no warnings 'uninitialized' ;
+
+ # Test quotewords() with other parameters and null last field
+ @words = quotewords(':+', 1, 'foo:::"bar:foo":zoo zoo:');
+ is(join(";", @words), qq(foo;"bar:foo";zoo zoo;));
+}
+
+# Test $keep eq 'delimiters' and last field zero
[EMAIL PROTECTED] = quotewords('\s+', 'delimiters', '4 3 2 1 0');
+is(join(";", @words), qq(4; ;3; ;2; ;1; ;0));
+
+# Big ol' nasty test (thanks, Joerk!)
+$string = 'aaaa"bbbbb" cc\\ cc \\\\\\"dddd" eee\\\\\\"ffff" "gg"';
+
+# First with $keep == 1
+$result = join('|', parse_line('\s+', 1, $string));
+is($result, 'aaaa"bbbbb"|cc\\ cc|\\\\\\"dddd" eee\\\\\\"ffff"|"gg"');
+
+# Now, $keep == 0
+$result = join('|', parse_line('\s+', 0, $string));
+is($result, 'aaaabbbbb|cc cc|\\"dddd eee\\"ffff|gg');
+
+# Now test single quote behavior
+$string = 'aaaa"bbbbb" cc\\ cc \\\\\\"dddd\' eee\\\\\\"ffff\' gg';
+$result = join('|', parse_line('\s+', 0, $string));
+is($result, 'aaaabbbbb|cc cc|\\"dddd eee\\\\\\"ffff|gg');
+
+# Make sure @nested_quotewords does the right thing
[EMAIL PROTECTED] = nested_quotewords('\s+', 0, 'a b c', '1 2 3', 'x y z');
+is (@lists, 3);
+is (@{$lists[0]}, 3);
+is (@{$lists[1]}, 3);
+is (@{$lists[2]}, 3);
+
+# Now test error return
+$string = 'foo bar baz"bach blech boop';
+
[EMAIL PROTECTED] = shellwords($string);
+is(@words, 0);
+
[EMAIL PROTECTED] = parse_line('s+', 0, $string);
+is(@words, 0);
+
[EMAIL PROTECTED] = quotewords('s+', 0, $string);
+is(@words, 0);
+
+{
+ # Gonna get some more undefined things back
+ no warnings 'uninitialized' ;
+
+ @words = nested_quotewords('s+', 0, $string);
+ is(@words, 0);
+
+ # Now test empty fields
+ $result = join('|', parse_line(':', 0, 'foo::0:"":::'));
+ is($result, 'foo||0||||');
+
+ # Test for 0 in quotes without $keep
+ $result = join('|', parse_line(':', 0, ':"0":'));
+ is($result, '|0|');
+
+ # Test for \001 in quoted string
+ $result = join('|', parse_line(':', 0, ':"' . "\001" . '":'));
+ is($result, "|\1|");
+
+}
+
+# Now test perlish single quote behavior
+$Text::ParseWords::PERL_SINGLE_QUOTE = 1;
+$string = 'aaaa"bbbbb" cc\ cc \\\\\"dddd\' eee\\\\\"\\\'ffff\' gg';
+$result = join('|', parse_line('\s+', 0, $string));
+is($result, 'aaaabbbbb|cc cc|\"dddd eee\\\\"\'ffff|gg');
+
+# test whitespace in the delimiters
[EMAIL PROTECTED] = quotewords(' ', 1, '4 3 2 1 0');
+is(join(";", @words), qq(4;3;2;1;0));
+
+# [perl #30442] Text::ParseWords does not handle backslashed newline inside
quoted text
+$string = qq{"field1" "field2\\\nstill field2" "field3"};
+
+$result = join('|', parse_line("\t", 1, $string));
+is($result, qq{"field1"|"field2\\\nstill field2"|"field3"});
+
+$result = join('|', parse_line("\t", 0, $string));
+is($result, "field1|field2\nstill field2|field3");
+
+SKIP: { # unicode
+ skip "No unicode",1 if $]<5.008;
+ $string = qq{"field1"\x{1234}"field2\\\x{1234}still field2"\x{1234}"field3"};
+ $result = join('|', parse_line("\x{1234}", 0, $string));
+ is($result, "field1|field2\x{1234}still field2|field3",'Unicode');
+}
+
+# missing quote after matching regex used to hang after change #22997
+"1234" =~ /(1)(2)(3)(4)/;
+$string = qq{"missing quote};
+$result = join('|', shellwords($string));
+is($result, "");
+
+# make sure shellwords strips out leading whitespace and trailng undefs
+# from parse_line, so it's behavior is more like /bin/sh
+$result = join('|', shellwords(" aa \\ \\ bb ", " \\ ", "cc dd ee\\ "));
+is($result, "aa| | bb| |cc|dd|ee ");
+
+$SIG{ALRM} = sub {die "Timeout!"};
+alarm(3);
[EMAIL PROTECTED] = Text::ParseWords::old_shellwords("foo\\");
+is(@words, 1);
+alarm(0);
==== //depot/maint-5.8/perl/lib/Text/ParseWords/taint.t#2 (text) ====
Index: perl/lib/Text/ParseWords/taint.t
--- perl/lib/Text/ParseWords/taint.t#1~23929~ 2005-02-05 04:57:43.000000000
-0800
+++ perl/lib/Text/ParseWords/taint.t 2008-11-03 02:35:59.000000000 -0800
@@ -2,12 +2,15 @@
# [perl #33173] shellwords.pl and tainting
BEGIN {
- chdir 't' if -d 't';
- @INC = '../lib';
- require Config;
- if ($Config::Config{extensions} !~ /\bList\/Util\b/) {
- print "1..0 # Skip: Scalar::Util was not built\n";
- exit 0;
+ if ( $ENV{PERL_CORE} ) {
+ chdir 't' if -d 't';
+ @INC = '../lib';
+ require Config;
+ no warnings 'once';
+ if ($Config::Config{extensions} !~ /\bList\/Util\b/) {
+ print "1..0 # Skip: Scalar::Util was not built\n";
+ exit 0;
+ }
}
}
End of Patch.
