Skip to content

compare inode numbers as strings in PathTools #18798

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 24, 2021
Merged

compare inode numbers as strings in PathTools #18798

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0132fa7
PathTools: compare inode numbers as strings
tonycoz May 17, 2021
92f3cd7
bump PathTools to 3.81
tonycoz May 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions dist/PathTools/Cwd.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use strict;
use Exporter;


our $VERSION = '3.80';
our $VERSION = '3.81';
my $xs_version = $VERSION;
$VERSION =~ tr/_//d;

Expand Down Expand Up @@ -275,7 +275,7 @@ sub fastcwd_ {
($odev, $oino) = ($cdev, $cino);
CORE::chdir('..') || return undef;
($cdev, $cino) = stat('.');
last if $odev == $cdev && $oino == $cino;
last if $odev == $cdev && $oino eq $cino;
opendir(DIR, '.') || return undef;
for (;;) {
$direntry = readdir(DIR);
Expand All @@ -284,7 +284,7 @@ sub fastcwd_ {
next if $direntry eq '..';

($tdev, $tino) = lstat($direntry);
last unless $tdev != $odev || $tino != $oino;
last unless $tdev != $odev || $tino ne $oino;
}
closedir(DIR);
return undef unless defined $direntry; # should never happen
Expand All @@ -298,7 +298,7 @@ sub fastcwd_ {
&& CORE::chdir($1) or return undef;
($cdev, $cino) = stat('.');
die "Unstable directory path, current directory changed unexpectedly"
if $cdev != $orig_cdev || $cino != $orig_cino;
if $cdev != $orig_cdev || $cino ne $orig_cino;
$path;
}
if (not defined &fastcwd) { *fastcwd = \&fastcwd_ }
Expand All @@ -315,7 +315,7 @@ sub chdir_init {
if ($ENV{'PWD'} and $^O ne 'os2' and $^O ne 'dos' and $^O ne 'MSWin32') {
my($dd,$di) = stat('.');
my($pd,$pi) = stat($ENV{'PWD'});
if (!defined $dd or !defined $pd or $di != $pi or $dd != $pd) {
if (!defined $dd or !defined $pd or $di ne $pi or $dd != $pd) {
$ENV{'PWD'} = cwd();
}
}
Expand All @@ -328,7 +328,7 @@ sub chdir_init {
if ($^O ne 'MSWin32' and $ENV{'PWD'} =~ m|(/[^/]+(/[^/]+/[^/]+))(.*)|s) {
my($pd,$pi) = stat($2);
my($dd,$di) = stat($1);
if (defined $pd and defined $dd and $di == $pi and $dd == $pd) {
if (defined $pd and defined $dd and $di ne $pi and $dd == $pd) {
$ENV{'PWD'}="$2$3";
}
}
Expand Down Expand Up @@ -430,7 +430,7 @@ sub _perl_abs_path
$! = $e;
return undef;
}
if ($pst[0] == $cst[0] && $pst[1] == $cst[1])
if ($pst[0] == $cst[0] && $pst[1] eq $cst[1])
{
$dir = undef;
}
Expand All @@ -448,7 +448,7 @@ sub _perl_abs_path
$tst[0] = $pst[0]+1 unless (@tst = lstat("$dotdots/$dir"))
}
while ($dir eq '.' || $dir eq '..' || $tst[0] != $pst[0] ||
$tst[1] != $pst[1]);
$tst[1] ne $pst[1]);
}
$cwd = (defined $dir ? "$dir" : "" ) . "/$cwd" ;
closedir(PARENT);
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package File::Spec;

use strict;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

my %module = (
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/AmigaOS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package File::Spec::AmigaOS;
use strict;
require File::Spec::Unix;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

our @ISA = qw(File::Spec::Unix);
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/Cygwin.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package File::Spec::Cygwin;
use strict;
require File::Spec::Unix;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

our @ISA = qw(File::Spec::Unix);
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/Epoc.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package File::Spec::Epoc;

use strict;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

require File::Spec::Unix;
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/Functions.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package File::Spec::Functions;
use File::Spec;
use strict;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

require Exporter;
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/Mac.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

our @ISA = qw(File::Spec::Unix);
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/OS2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

our @ISA = qw(File::Spec::Unix);
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/Unix.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package File::Spec::Unix;
use strict;
use Cwd ();

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

=head1 NAME
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/VMS.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

our @ISA = qw(File::Spec::Unix);
Expand Down
2 changes: 1 addition & 1 deletion dist/PathTools/lib/File/Spec/Win32.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use strict;
use Cwd ();
require File::Spec::Unix;

our $VERSION = '3.80';
our $VERSION = '3.81';
$VERSION =~ tr/_//d;

our @ISA = qw(File::Spec::Unix);
Expand Down