Change 27398 by [EMAIL PROTECTED] on 2006/03/07 04:48:29
Upgrade to PathTools-3.17
Affected files ...
... //depot/perl/ext/Cwd/Cwd.xs#36 edit
... //depot/perl/ext/Cwd/t/cwd.t#36 edit
... //depot/perl/lib/Cwd.pm#100 edit
... //depot/perl/lib/File/Spec.pm#50 edit
Differences ...
==== //depot/perl/ext/Cwd/Cwd.xs#36 (text) ====
Index: perl/ext/Cwd/Cwd.xs
--- perl/ext/Cwd/Cwd.xs#35~26318~ 2005-12-10 07:42:39.000000000 -0800
+++ perl/ext/Cwd/Cwd.xs 2006-03-06 20:48:29.000000000 -0800
@@ -409,7 +409,7 @@
}
void
-getcwd()
+getcwd(...)
PROTOTYPE: DISABLE
PPCODE:
{
==== //depot/perl/ext/Cwd/t/cwd.t#36 (text) ====
Index: perl/ext/Cwd/t/cwd.t
--- perl/ext/Cwd/t/cwd.t#35~25711~ 2005-10-06 20:29:37.000000000 -0700
+++ perl/ext/Cwd/t/cwd.t 2006-03-06 20:48:29.000000000 -0800
@@ -18,7 +18,7 @@
use Test::More;
require VMS::Filespec if $^O eq 'VMS';
-my $tests = 29;
+my $tests = 30;
# _perl_abs_path() currently only works when the directory separator
# is '/', so don't test it when it won't work.
my $EXTRA_ABSPATH_TESTS = ($Config{prefix} =~ m/\//) && $^O ne 'cygwin';
@@ -125,6 +125,13 @@
dir_ends_with( $result, $Test_Dir, "$func()" );
}
+{
+ # Some versions of File::Path (e.g. that shipped with perl 5.8.5)
+ # call getcwd() with an argument (perhaps by calling it as a
+ # method?), so make sure that doesn't die.
+ is getcwd(), getcwd('foo'), "Call getcwd() with an argument";
+}
+
# Cwd::chdir should also update $ENV{PWD}
dir_ends_with( $ENV{PWD}, $Test_Dir, 'Cwd::chdir() updates $ENV{PWD}' );
my $updir = File::Spec->updir;
==== //depot/perl/lib/Cwd.pm#100 (text) ====
Index: perl/lib/Cwd.pm
--- perl/lib/Cwd.pm#99~26508~ 2005-12-27 19:27:13.000000000 -0800
+++ perl/lib/Cwd.pm 2006-03-06 20:48:29.000000000 -0800
@@ -171,7 +171,7 @@
use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
-$VERSION = '3.15';
+$VERSION = '3.17';
@ISA = qw/ Exporter /;
@EXPORT = qw(cwd getcwd fastcwd fastgetcwd);
@@ -357,6 +357,15 @@
}
}
+if ($^O eq 'cygwin') {
+ # We need to make sure cwd() is called with no args, because it's
+ # got an arg-less prototype and will die if args are present.
+ local $^W = 0;
+ my $orig_cwd = \&cwd;
+ *cwd = sub { &$orig_cwd() }
+}
+
+
# set a reasonable (and very safe) default for fastgetcwd, in case it
# isn't redefined later (20001212 rspier)
*fastgetcwd = \&cwd;
==== //depot/perl/lib/File/Spec.pm#50 (text) ====
Index: perl/lib/File/Spec.pm
--- perl/lib/File/Spec.pm#49~26508~ 2005-12-27 19:27:13.000000000 -0800
+++ perl/lib/File/Spec.pm 2006-03-06 20:48:29.000000000 -0800
@@ -3,7 +3,7 @@
use strict;
use vars qw(@ISA $VERSION);
-$VERSION = '3.15';
+$VERSION = '3.17';
$VERSION = eval $VERSION;
my %module = (MacOS => 'Mac',
@@ -230,10 +230,10 @@
$rel_path = File::Spec->abs2rel( $path ) ;
$rel_path = File::Spec->abs2rel( $path, $base ) ;
-If C<$base> is not present or '', then L<cwd()|Cwd> is used. If C<$base> is
+If C<$base> is not present or '', then L<Cwd::cwd()|Cwd> is used. If C<$base>
is
relative, then it is converted to absolute form using
L</rel2abs()>. This means that it is taken to be relative to
-L<cwd()|Cwd>.
+L<Cwd::cwd()|Cwd>.
On systems with the concept of volume, if C<$path> and C<$base> appear to be
on two different volumes, we will not attempt to resolve the two
@@ -246,7 +246,7 @@
directories.
If C<$path> is relative, it is converted to absolute form using L</rel2abs()>.
-This means that it is taken to be relative to L<cwd()|Cwd>.
+This means that it is taken to be relative to L<Cwd::cwd()|Cwd>.
No checks against the filesystem are made. On VMS, there is
interaction with the working environment, as logicals and
@@ -261,9 +261,9 @@
$abs_path = File::Spec->rel2abs( $path ) ;
$abs_path = File::Spec->rel2abs( $path, $base ) ;
-If C<$base> is not present or '', then L<cwd()|Cwd> is used. If C<$base> is
relative,
+If C<$base> is not present or '', then L<Cwd::cwd()|Cwd> is used. If C<$base>
is relative,
then it is converted to absolute form using L</rel2abs()>. This means that it
-is taken to be relative to L<cwd()|Cwd>.
+is taken to be relative to L<Cwd::cwd()|Cwd>.
On systems with the concept of volume, if C<$path> and C<$base> appear to be
on two different volumes, we will not attempt to resolve the two
End of Patch.
