Compare commits
No commits in common. 'c9' and 'c8-stream-5.24' have entirely different histories.
c9
...
c8-stream-
@ -1 +1 @@
|
||||
SOURCES/PathTools-3.75.tar.gz
|
||||
SOURCES/PathTools-3.62.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
ff2f9e55e33a1cfe1247e29f4e136b9a78f4be3a SOURCES/PathTools-3.75.tar.gz
|
||||
356530987ccfb61779ce038978a614aa64679d72 SOURCES/PathTools-3.62.tar.gz
|
||||
|
||||
@ -0,0 +1,204 @@
|
||||
diff --git a/Cwd.pm b/Cwd.pm
|
||||
index 9b5183e..e8b9f19 100644
|
||||
--- a/Cwd.pm
|
||||
+++ b/Cwd.pm
|
||||
@@ -3,7 +3,7 @@ use strict;
|
||||
use Exporter;
|
||||
use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
my $xs_version = $VERSION;
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
|
||||
index 2709c39..32b987e 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.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
my %module = (MacOS => 'Mac',
|
||||
diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm
|
||||
index e6d6f5f2a..7a5889c 100644
|
||||
--- a/lib/File/Spec/AmigaOS.pm
|
||||
+++ b/lib/File/Spec/AmigaOS.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use vars qw(@ISA $VERSION);
|
||||
require File::Spec::Unix;
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.64';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@ISA = qw(File::Spec::Unix);
|
||||
@@ -15,7 +15,8 @@ File::Spec::AmigaOS - File::Spec for AmigaOS
|
||||
|
||||
=head1 SYNOPSIS
|
||||
|
||||
- require File::Spec::AmigaOS; # Done automatically by File::Spec if needed
|
||||
+ require File::Spec::AmigaOS; # Done automatically by File::Spec
|
||||
+ # if needed
|
||||
|
||||
=head1 DESCRIPTION
|
||||
|
||||
diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm
|
||||
index 67f056f..2092eb8 100644
|
||||
--- a/lib/File/Spec/Cygwin.pm
|
||||
+++ b/lib/File/Spec/Cygwin.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use vars qw(@ISA $VERSION);
|
||||
require File::Spec::Unix;
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm
|
||||
index 17e3f54..22f0192 100644
|
||||
--- a/lib/File/Spec/Epoc.pm
|
||||
+++ b/lib/File/Spec/Epoc.pm
|
||||
@@ -3,7 +3,7 @@ package File::Spec::Epoc;
|
||||
use strict;
|
||||
use vars qw($VERSION @ISA);
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
require File::Spec::Unix;
|
||||
diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm
|
||||
index 470c771..af2c498 100644
|
||||
--- a/lib/File/Spec/Functions.pm
|
||||
+++ b/lib/File/Spec/Functions.pm
|
||||
@@ -5,7 +5,7 @@ use strict;
|
||||
|
||||
use vars qw(@ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $VERSION);
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
require Exporter;
|
||||
diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm
|
||||
index 329451f..52c3bfe 100644
|
||||
--- a/lib/File/Spec/Mac.pm
|
||||
+++ b/lib/File/Spec/Mac.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use vars qw(@ISA $VERSION);
|
||||
require File::Spec::Unix;
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
|
||||
index 55e6d33..804ecdb 100644
|
||||
--- a/lib/File/Spec/OS2.pm
|
||||
+++ b/lib/File/Spec/OS2.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use vars qw(@ISA $VERSION);
|
||||
require File::Spec::Unix;
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
|
||||
index 586e9b0..3916a11 100644
|
||||
--- a/lib/File/Spec/Unix.pm
|
||||
+++ b/lib/File/Spec/Unix.pm
|
||||
@@ -3,7 +3,7 @@ package File::Spec::Unix;
|
||||
use strict;
|
||||
use vars qw($VERSION);
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
my $xs_version = $VERSION;
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
diff --git a/lib/File/Spec/VMS.pm b/lib/File/Spec/VMS.pm
|
||||
index 600c49f..02cc0b0 100644
|
||||
--- a/lib/File/Spec/VMS.pm
|
||||
+++ b/lib/File/Spec/VMS.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use vars qw(@ISA $VERSION);
|
||||
require File::Spec::Unix;
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@ISA = qw(File::Spec::Unix);
|
||||
@@ -437,15 +437,13 @@ Attempt to convert an absolute file specification to a relative specification.
|
||||
|
||||
sub abs2rel {
|
||||
my $self = shift;
|
||||
- return vmspath(File::Spec::Unix::abs2rel( $self, @_ ))
|
||||
- if ((grep m{/}, @_) && !(grep m{(?<!\^)[\[<:]}, @_));
|
||||
-
|
||||
my($path,$base) = @_;
|
||||
+
|
||||
$base = $self->_cwd() unless defined $base and length $base;
|
||||
|
||||
# If there is no device or directory syntax on $base, make sure it
|
||||
# is treated as a directory.
|
||||
- $base = VMS::Filespec::vmspath($base) unless $base =~ m{(?<!\^)[\[<:]};
|
||||
+ $base = vmspath($base) unless $base =~ m{(?<!\^)[\[<:]};
|
||||
|
||||
for ($path, $base) { $_ = $self->rel2abs($_) }
|
||||
|
||||
@@ -461,7 +459,7 @@ sub abs2rel {
|
||||
|
||||
my ($path_volume, $path_directories, $path_file) = $self->splitpath($path);
|
||||
my ($base_volume, $base_directories, $base_file) = $self->splitpath($base);
|
||||
- return $path unless lc($path_volume) eq lc($base_volume);
|
||||
+ return $self->canonpath( $path ) unless lc($path_volume) eq lc($base_volume);
|
||||
|
||||
# Now, remove all leading components that are the same
|
||||
my @pathchunks = $self->splitdir( $path_directories );
|
||||
diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm
|
||||
index 6df7ee8..1105b67 100644
|
||||
--- a/lib/File/Spec/Win32.pm
|
||||
+++ b/lib/File/Spec/Win32.pm
|
||||
@@ -5,7 +5,7 @@ use strict;
|
||||
use vars qw(@ISA $VERSION);
|
||||
require File::Spec::Unix;
|
||||
|
||||
-$VERSION = '3.62';
|
||||
+$VERSION = '3.63';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@ISA = qw(File::Spec::Unix);
|
||||
diff --git a/t/abs2rel.t b/t/abs2rel.t
|
||||
index 5e33ab6..b77a1c2 100644
|
||||
--- a/t/abs2rel.t
|
||||
+++ b/t/abs2rel.t
|
||||
@@ -6,7 +6,7 @@ use Test::More;
|
||||
use Cwd qw(cwd getcwd abs_path);
|
||||
use File::Spec();
|
||||
use File::Temp qw(tempdir);
|
||||
-use File::Path qw(make_path);
|
||||
+use File::Path qw(mkpath);
|
||||
|
||||
my $startdir = cwd();
|
||||
my @files = ( 'anyfile', './anyfile', '../first_sub_dir/anyfile', '../second_sub_dir/second_file' );
|
||||
@@ -25,8 +25,8 @@ sub test_rel2abs {
|
||||
File::Spec->catdir('first_sub_dir', 'sub_sub_dir'),
|
||||
'second_sub_dir'
|
||||
);
|
||||
- make_path(@subdirs, { mode => 0711 })
|
||||
- or die "Unable to make_path: $!";
|
||||
+ mkpath(@subdirs, { mode => 0711 })
|
||||
+ or die "Unable to mkpath: $!";
|
||||
|
||||
open my $OUT2, '>',
|
||||
File::Spec->catfile('second_sub_dir', 'second_file')
|
||||
@ -0,0 +1,62 @@
|
||||
diff -up PathTools/Cwd.pm.cve PathTools/Cwd.pm
|
||||
--- PathTools/Cwd.pm.cve 2016-03-01 13:33:02.000000000 +0100
|
||||
+++ PathTools/Cwd.pm 2016-08-02 13:39:39.814316060 +0200
|
||||
@@ -40,7 +40,10 @@ if ($^O eq 'os2') {
|
||||
my $use_vms_feature;
|
||||
BEGIN {
|
||||
if ($^O eq 'VMS') {
|
||||
- if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
|
||||
+ if (eval { local $SIG{__DIE__};
|
||||
+ local @INC = @INC;
|
||||
+ pop @INC if $INC[-1] eq '.';
|
||||
+ require VMS::Feature; }) {
|
||||
$use_vms_feature = 1;
|
||||
}
|
||||
}
|
||||
diff -up PathTools/lib/File/Spec/Cygwin.pm.cve PathTools/lib/File/Spec/Cygwin.pm
|
||||
--- PathTools/lib/File/Spec/Cygwin.pm.cve 2016-03-01 13:33:02.000000000 +0100
|
||||
+++ PathTools/lib/File/Spec/Cygwin.pm 2016-08-02 13:39:39.814316060 +0200
|
||||
@@ -137,7 +137,11 @@ sub case_tolerant {
|
||||
if ($mntopts and ($mntopts =~ /,managed/)) {
|
||||
return 0;
|
||||
}
|
||||
- eval { require Win32API::File; } or return 1;
|
||||
+ eval {
|
||||
+ local @INC = @INC;
|
||||
+ pop @INC if $INC[-1] eq '.';
|
||||
+ require Win32API::File;
|
||||
+ } or return 1;
|
||||
my $osFsType = "\0"x256;
|
||||
my $osVolName = "\0"x256;
|
||||
my $ouFsFlags = 0;
|
||||
diff -up PathTools/lib/File/Spec/VMS.pm.cve PathTools/lib/File/Spec/VMS.pm
|
||||
--- PathTools/lib/File/Spec/VMS.pm.cve 2016-03-01 13:33:02.000000000 +0100
|
||||
+++ PathTools/lib/File/Spec/VMS.pm 2016-08-02 13:39:39.814316060 +0200
|
||||
@@ -39,7 +39,10 @@ via the C<DECC$FILENAME_UNIX_REPORT> CRT
|
||||
|
||||
my $use_feature;
|
||||
BEGIN {
|
||||
- if (eval { local $SIG{__DIE__}; require VMS::Feature; }) {
|
||||
+ if (eval { local $SIG{__DIE__};
|
||||
+ local @INC = @INC;
|
||||
+ pop @INC if $INC[-1] eq '.';
|
||||
+ require VMS::Feature; }) {
|
||||
$use_feature = 1;
|
||||
}
|
||||
}
|
||||
diff -up PathTools/lib/File/Spec/Win32.pm.cve PathTools/lib/File/Spec/Win32.pm
|
||||
--- PathTools/lib/File/Spec/Win32.pm.cve 2016-03-01 13:33:02.000000000 +0100
|
||||
+++ PathTools/lib/File/Spec/Win32.pm 2016-08-02 13:39:39.814316060 +0200
|
||||
@@ -90,7 +90,11 @@ Default: 1
|
||||
=cut
|
||||
|
||||
sub case_tolerant {
|
||||
- eval { require Win32API::File; } or return 1;
|
||||
+ eval {
|
||||
+ local @INC = @INC;
|
||||
+ pop @INC if $INC[-1] eq '.';
|
||||
+ require Win32API::File;
|
||||
+ } or return 1;
|
||||
my $drive = shift || "C:";
|
||||
my $osFsType = "\0"x256;
|
||||
my $osVolName = "\0"x256;
|
||||
@ -1,283 +0,0 @@
|
||||
From 3c570b93e7ca990b3274219dd828e8fdaac0bf9d Mon Sep 17 00:00:00 2001
|
||||
From: Jitka Plesnikova <jplesnik@redhat.com>
|
||||
Date: Thu, 25 Apr 2019 17:04:30 +0200
|
||||
Subject: [PATCH] Upgrade to 3.78
|
||||
|
||||
---
|
||||
Cwd.pm | 8 ++++++--
|
||||
lib/File/Spec.pm | 2 +-
|
||||
lib/File/Spec/AmigaOS.pm | 2 +-
|
||||
lib/File/Spec/Cygwin.pm | 2 +-
|
||||
lib/File/Spec/Epoc.pm | 2 +-
|
||||
lib/File/Spec/Functions.pm | 2 +-
|
||||
lib/File/Spec/Mac.pm | 2 +-
|
||||
lib/File/Spec/OS2.pm | 2 +-
|
||||
lib/File/Spec/Unix.pm | 2 +-
|
||||
lib/File/Spec/Win32.pm | 14 ++------------
|
||||
t/Spec.t | 4 ++--
|
||||
t/cwd.t | 11 ++++++++++-
|
||||
t/cwd_enoent.t | 9 ++++++---
|
||||
13 files changed, 34 insertions(+), 28 deletions(-)
|
||||
|
||||
diff --git a/Cwd.pm b/Cwd.pm
|
||||
index 16d5b11..9b173c2 100644
|
||||
--- a/Cwd.pm
|
||||
+++ b/Cwd.pm
|
||||
@@ -3,7 +3,7 @@ use strict;
|
||||
use Exporter;
|
||||
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
my $xs_version = $VERSION;
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
@@ -171,7 +171,7 @@ if($^O ne 'MSWin32') {
|
||||
if ($^O =~ /android/) {
|
||||
# If targetsh is executable, then we're either a full
|
||||
# perl, or a miniperl for a native build.
|
||||
- if (-x $Config::Config{targetsh}) {
|
||||
+ if ( exists($Config::Config{targetsh}) && -x $Config::Config{targetsh}) {
|
||||
$pwd_cmd = "$Config::Config{targetsh} -c pwd"
|
||||
}
|
||||
else {
|
||||
@@ -659,6 +659,10 @@ if (exists $METHOD_MAP{$^O}) {
|
||||
}
|
||||
}
|
||||
|
||||
+# built-in from 5.30
|
||||
+*getcwd = \&Internals::getcwd
|
||||
+ if !defined &getcwd && defined &Internals::getcwd;
|
||||
+
|
||||
# In case the XS version doesn't load.
|
||||
*abs_path = \&_perl_abs_path unless defined &abs_path;
|
||||
*getcwd = \&_perl_getcwd unless defined &getcwd;
|
||||
diff --git a/lib/File/Spec.pm b/lib/File/Spec.pm
|
||||
index eb3b55a..7fe3272 100644
|
||||
--- a/lib/File/Spec.pm
|
||||
+++ b/lib/File/Spec.pm
|
||||
@@ -2,7 +2,7 @@ package File::Spec;
|
||||
|
||||
use strict;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
my %module = (
|
||||
diff --git a/lib/File/Spec/AmigaOS.pm b/lib/File/Spec/AmigaOS.pm
|
||||
index 1355768..2b7d18a 100644
|
||||
--- a/lib/File/Spec/AmigaOS.pm
|
||||
+++ b/lib/File/Spec/AmigaOS.pm
|
||||
@@ -3,7 +3,7 @@ package File::Spec::AmigaOS;
|
||||
use strict;
|
||||
require File::Spec::Unix;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
our @ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/Cygwin.pm b/lib/File/Spec/Cygwin.pm
|
||||
index 9dc15a1..d44ced3 100644
|
||||
--- a/lib/File/Spec/Cygwin.pm
|
||||
+++ b/lib/File/Spec/Cygwin.pm
|
||||
@@ -3,7 +3,7 @@ package File::Spec::Cygwin;
|
||||
use strict;
|
||||
require File::Spec::Unix;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
our @ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/Epoc.pm b/lib/File/Spec/Epoc.pm
|
||||
index bd87b68..b611cd9 100644
|
||||
--- a/lib/File/Spec/Epoc.pm
|
||||
+++ b/lib/File/Spec/Epoc.pm
|
||||
@@ -2,7 +2,7 @@ package File::Spec::Epoc;
|
||||
|
||||
use strict;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
require File::Spec::Unix;
|
||||
diff --git a/lib/File/Spec/Functions.pm b/lib/File/Spec/Functions.pm
|
||||
index 19ab4db..3f617bd 100644
|
||||
--- a/lib/File/Spec/Functions.pm
|
||||
+++ b/lib/File/Spec/Functions.pm
|
||||
@@ -3,7 +3,7 @@ package File::Spec::Functions;
|
||||
use File::Spec;
|
||||
use strict;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
require Exporter;
|
||||
diff --git a/lib/File/Spec/Mac.pm b/lib/File/Spec/Mac.pm
|
||||
index 926a5dd..d920d2f 100644
|
||||
--- a/lib/File/Spec/Mac.pm
|
||||
+++ b/lib/File/Spec/Mac.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use Cwd ();
|
||||
require File::Spec::Unix;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
our @ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/OS2.pm b/lib/File/Spec/OS2.pm
|
||||
index 4404fe8..603781a 100644
|
||||
--- a/lib/File/Spec/OS2.pm
|
||||
+++ b/lib/File/Spec/OS2.pm
|
||||
@@ -4,7 +4,7 @@ use strict;
|
||||
use Cwd ();
|
||||
require File::Spec::Unix;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
our @ISA = qw(File::Spec::Unix);
|
||||
diff --git a/lib/File/Spec/Unix.pm b/lib/File/Spec/Unix.pm
|
||||
index cd29f76..6749e60 100644
|
||||
--- a/lib/File/Spec/Unix.pm
|
||||
+++ b/lib/File/Spec/Unix.pm
|
||||
@@ -3,7 +3,7 @@ package File::Spec::Unix;
|
||||
use strict;
|
||||
use Cwd ();
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
=head1 NAME
|
||||
diff --git a/lib/File/Spec/Win32.pm b/lib/File/Spec/Win32.pm
|
||||
index 0cf0e28..5934010 100644
|
||||
--- a/lib/File/Spec/Win32.pm
|
||||
+++ b/lib/File/Spec/Win32.pm
|
||||
@@ -5,7 +5,7 @@ use strict;
|
||||
use Cwd ();
|
||||
require File::Spec::Unix;
|
||||
|
||||
-our $VERSION = '3.75';
|
||||
+our $VERSION = '3.78';
|
||||
$VERSION =~ tr/_//d;
|
||||
|
||||
our @ISA = qw(File::Spec::Unix);
|
||||
@@ -137,7 +137,7 @@ sub catfile {
|
||||
# Legacy / compatibility support
|
||||
#
|
||||
shift, return _canon_cat( "/", @_ )
|
||||
- if $_[0] eq "";
|
||||
+ if !@_ || $_[0] eq "";
|
||||
|
||||
# Compatibility with File::Spec <= 3.26:
|
||||
# catfile('A:', 'foo') should return 'A:\foo'.
|
||||
@@ -407,16 +407,6 @@ sub _canon_cat # @path -> path
|
||||
)+ # performance boost -- I do not know why
|
||||
}{\\}gx;
|
||||
|
||||
- # XXX I do not know whether more dots are supported by the OS supporting
|
||||
- # this ... annotation (NetWare or symbian but not MSWin32).
|
||||
- # Then .... could easily become ../../.. etc:
|
||||
- # Replace \.\.\. by (\.\.\.+) and substitute with
|
||||
- # { $1 . ".." . "\\.." x (length($2)-2) }gex
|
||||
- # ... --> ../..
|
||||
- $path =~ s{ (\A|\\) # at begin or after a slash
|
||||
- \.\.\.
|
||||
- (?=\\|\z) # at end or followed by slash
|
||||
- }{$1..\\..}gx;
|
||||
# xx\yy\..\zz --> xx\zz
|
||||
while ( $path =~ s{(?:
|
||||
(?:\A|\\) # at begin or after a slash
|
||||
diff --git a/t/Spec.t b/t/Spec.t
|
||||
index 1b26190..c953391 100644
|
||||
--- a/t/Spec.t
|
||||
+++ b/t/Spec.t
|
||||
@@ -277,9 +277,9 @@ my @tests = (
|
||||
[ "Win32->canonpath('//a/b/../../c')", '\\\\a\\b\\c' ],
|
||||
[ "Win32->canonpath('//a/b/c/../d')", '\\\\a\\b\\d' ],
|
||||
[ "Win32->canonpath('//a/b/c/../../d')",'\\\\a\\b\\d' ],
|
||||
-[ "Win32->canonpath('//a/b/c/.../d')", '\\\\a\\b\\d' ],
|
||||
+[ "Win32->canonpath('//a/b/c/.../d')", '\\\\a\\b\\c\\...\\d' ],
|
||||
[ "Win32->canonpath('/a/b/c/../../d')", '\\a\\d' ],
|
||||
-[ "Win32->canonpath('/a/b/c/.../d')", '\\a\\d' ],
|
||||
+[ "Win32->canonpath('/a/b/c/.../d')", '\\a\\b\\c\\...\\d' ],
|
||||
[ "Win32->canonpath('\\../temp\\')", '\\temp' ],
|
||||
[ "Win32->canonpath('\\../')", '\\' ],
|
||||
[ "Win32->canonpath('\\..\\')", '\\' ],
|
||||
diff --git a/t/cwd.t b/t/cwd.t
|
||||
index 483b437..c056938 100644
|
||||
--- a/t/cwd.t
|
||||
+++ b/t/cwd.t
|
||||
@@ -10,6 +10,7 @@ chdir 't';
|
||||
use Config;
|
||||
use File::Spec;
|
||||
use File::Path;
|
||||
+use Errno qw(EACCES);
|
||||
|
||||
use lib File::Spec->catdir('t', 'lib');
|
||||
use Test::More;
|
||||
@@ -208,7 +209,15 @@ SKIP: {
|
||||
|
||||
like($abs_path, qr|$want$|i, "Cwd::abs_path produced $abs_path");
|
||||
like($fast_abs_path, qr|$want$|i, "Cwd::fast_abs_path produced $fast_abs_path");
|
||||
- like($pas, qr|$want$|i, "Cwd::_perl_abs_path produced $pas") if $EXTRA_ABSPATH_TESTS;
|
||||
+ if ($EXTRA_ABSPATH_TESTS) {
|
||||
+ # _perl_abs_path() can fail if some ancestor directory isn't readable
|
||||
+ if (defined $pas) {
|
||||
+ like($pas, qr|$want$|i, "Cwd::_perl_abs_path produced $pas");
|
||||
+ }
|
||||
+ else {
|
||||
+ is($!+0, EACCES, "check we got the expected error on failure");
|
||||
+ }
|
||||
+ }
|
||||
|
||||
rmtree($test_dirs[0], 0, 0);
|
||||
1 while unlink $file;
|
||||
diff --git a/t/cwd_enoent.t b/t/cwd_enoent.t
|
||||
index 8f3a1fb..510c65e 100644
|
||||
--- a/t/cwd_enoent.t
|
||||
+++ b/t/cwd_enoent.t
|
||||
@@ -2,7 +2,7 @@ use warnings;
|
||||
use strict;
|
||||
|
||||
use Config;
|
||||
-use Errno qw(ENOENT);
|
||||
+use Errno qw();
|
||||
use File::Temp qw(tempdir);
|
||||
use Test::More;
|
||||
|
||||
@@ -19,6 +19,7 @@ unless(mkdir("$tmp/testdir") && chdir("$tmp/testdir") && rmdir("$tmp/testdir")){
|
||||
plan tests => 8;
|
||||
require Cwd;
|
||||
|
||||
+my @acceptable_errnos = (&Errno::ENOENT, (defined &Errno::ESTALE ? &Errno::ESTALE : ()));
|
||||
foreach my $type (qw(regular perl)) {
|
||||
SKIP: {
|
||||
skip "_perl_abs_path() not expected to work", 4
|
||||
@@ -36,12 +37,14 @@ foreach my $type (qw(regular perl)) {
|
||||
$res = Cwd::getcwd();
|
||||
$eno = 0+$!;
|
||||
is $res, undef, "$type getcwd result on non-existent directory";
|
||||
- is $eno, ENOENT, "$type getcwd errno on non-existent directory";
|
||||
+ ok((grep { $eno == $_ } @acceptable_errnos), "$type getcwd errno on non-existent directory")
|
||||
+ or diag "Got errno code $eno, expected " . join(", ", @acceptable_errnos);
|
||||
$! = 0;
|
||||
$res = Cwd::abs_path(".");
|
||||
$eno = 0+$!;
|
||||
is $res, undef, "$type abs_path result on non-existent directory";
|
||||
- is $eno, ENOENT, "$type abs_path errno on non-existent directory";
|
||||
+ ok((grep { $eno == $_ } @acceptable_errnos), "$type abs_path errno on non-existent directory")
|
||||
+ or diag "Got errno code $eno, expected " . join(", ", @acceptable_errnos);
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From c8c367581c3333c38d07481e2ea8d81171403c81 Mon Sep 17 00:00:00 2001
|
||||
From: David Mitchell <davem@iabyn.com>
|
||||
Date: Mon, 26 Oct 2020 15:11:14 +0000
|
||||
Subject: [PATCH] PathTools/Cwd.xs: fix off-by-one in bsd_realpath()
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
At the heart of this function is a loop which repeatedly finds the next
|
||||
component in the path, processes it, then chops that component off the
|
||||
front of the path by shifting the string to the start of the buffer;
|
||||
i.e. something like:
|
||||
|
||||
while (remaining_len) {
|
||||
s = strchr(remaining, '/')
|
||||
...
|
||||
remaining_len -= s - remaining;
|
||||
memmove(remaining, s, remaining_len + 1);
|
||||
}
|
||||
|
||||
The problem is that the per-iteration decrement to remaining_len doesn't
|
||||
take account of the '/' character, so each iteration, remaining_len gets
|
||||
one more byte too big.
|
||||
|
||||
It turns out that this is harmless - it just means that more and more
|
||||
garbage characters after the trailing null byte get copied each time,
|
||||
but after each copy the path string is still well formed, with a
|
||||
trailing null in the right place. So just the random garbage after the
|
||||
null byte is different.
|
||||
|
||||
This commit fixes that.
|
||||
|
||||
Although really, it would be better to just increment the
|
||||
start-of-string pointer each time rather than shift the whole string
|
||||
each time.
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
dist/PathTools/Cwd.xs | 15 ++++++++++++---
|
||||
1 file changed, 12 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dist/PathTools/Cwd.xs b/dist/PathTools/Cwd.xs
|
||||
index 8662400e47..e7ecb3c6c1 100644
|
||||
--- a/dist/PathTools/Cwd.xs
|
||||
+++ b/dist/PathTools/Cwd.xs
|
||||
@@ -119,15 +119,24 @@ bsd_realpath(const char *path, char resolved[MAXPATHLEN])
|
||||
|
||||
p = strchr(remaining, '/');
|
||||
s = p ? p : remaining + remaining_len;
|
||||
+
|
||||
if ((STRLEN)(s - remaining) >= (STRLEN)sizeof(next_token)) {
|
||||
errno = ENAMETOOLONG;
|
||||
return (NULL);
|
||||
}
|
||||
memcpy(next_token, remaining, s - remaining);
|
||||
next_token[s - remaining] = '\0';
|
||||
- remaining_len -= s - remaining;
|
||||
- if (p != NULL)
|
||||
- memmove(remaining, s + 1, remaining_len + 1);
|
||||
+
|
||||
+ /* shift first component off front of path, including '/' */
|
||||
+ if (p) {
|
||||
+ s++; /* skip '/' */
|
||||
+ remaining_len -= s - remaining;
|
||||
+ /* the +1 includes the trailing '\0' */
|
||||
+ memmove(remaining, s, remaining_len + 1);
|
||||
+ }
|
||||
+ else
|
||||
+ remaining_len = 0;
|
||||
+
|
||||
if (resolved[resolved_len - 1] != '/') {
|
||||
if (resolved_len + 1 >= MAXPATHLEN) {
|
||||
errno = ENAMETOOLONG;
|
||||
--
|
||||
2.25.4
|
||||
|
||||
Loading…
Reference in new issue