diff options
author | Steve Peters <steve@fisharerojo.org> | 2006-03-07 04:48:29 +0000 |
---|---|---|
committer | Steve Peters <steve@fisharerojo.org> | 2006-03-07 04:48:29 +0000 |
commit | 23bb49fa8c98c39adab74ba793fe7dad073789c2 (patch) | |
tree | c90fa0db0ebecc88d32a2577eaa0f7cc7437045b /lib/File | |
parent | 71fbae4b4b3f337a0c2643cc859be9d389fd2e98 (diff) | |
download | perl-23bb49fa8c98c39adab74ba793fe7dad073789c2.tar.gz |
Upgrade to PathTools-3.17
p4raw-id: //depot/perl@27398
Diffstat (limited to 'lib/File')
-rw-r--r-- | lib/File/Spec.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm index 4554eb1def..9aac374c13 100644 --- a/lib/File/Spec.pm +++ b/lib/File/Spec.pm @@ -3,7 +3,7 @@ package File::Spec; use strict; use vars qw(@ISA $VERSION); -$VERSION = '3.15'; +$VERSION = '3.17'; $VERSION = eval $VERSION; my %module = (MacOS => 'Mac', @@ -230,10 +230,10 @@ from the base path to the destination path: $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 @@ C<$base> filename as well. Otherwise all path components are assumed to be 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 @@ Converts a relative path to an absolute path. $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 |