diff options
| -rw-r--r-- | Porting/check83.pl | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Porting/check83.pl b/Porting/check83.pl index be6b9826ac..eb020023b3 100644 --- a/Porting/check83.pl +++ b/Porting/check83.pl @@ -1,4 +1,6 @@ -#!/usr/bin/perl +#!/usr/bin/perl -w + +use strict; # Check whether there are naming conflicts when names are truncated to # the DOSish case-ignoring 8.3 format, plus other portability no-nos. @@ -10,21 +12,22 @@ # not longer than three". my %seen; +my $maxl = 30; # make up a limit for a maximum filename length sub eight_dot_three { - next if $seen{$_[0]}++; - my ($dir, $base, $ext) = ($_[0] =~ m!^(?:(.+)/)?([^/.]+)(?:\.([^/.]+))?$!); + return () if $seen{$_[0]}++; + my ($dir, $base, $ext) = ($_[0] =~ m{^(?:(.+)/)?([^/.]+)(?:\.([^/.]+))?$}); my $file = $base . ( defined $ext ? ".$ext" : "" ); $base = substr($base, 0, 8); $ext = substr($ext, 0, 3) if defined $ext; - if ($dir =~ /\./) { + if (defined $dir && $dir =~ /\./) { print "directory name contains '.': $dir\n"; } if ($file =~ /[^A-Za-z0-9\._-]/) { print "filename contains non-portable characters: $_[0]\n"; } - if (length $file > 30) { - print "filename longer than 30 characters: $_[0]\n"; # make up a limit + if (length $file > $maxl) { + print "filename longer than $maxl characters: $file\n"; } if (defined $dir) { return ($dir, defined $ext ? "$dir/$base.$ext" : "$dir/$base"); @@ -49,6 +52,7 @@ if (open(MANIFEST, "MANIFEST")) { } while (m!/|\z!g) { my ($dir, $edt) = eight_dot_three($`); + next unless defined $dir; ($dir, $edt) = map { lc } ($dir, $edt); push @{$dir{$dir}->{$edt}}, $_; } |