X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fcheck83.pl;h=56989fa9e07a9720fc179c2bdc431347ba9f5b7f;hb=115454352a978d4e8b08f627af1ad772bab2816b;hp=be6b9826ac04db6fd2326f9afb1b08f5221e9cee;hpb=a9b610e983e597edf8d9f9d6eeb62f1e3a3db482;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/check83.pl b/Porting/check83.pl
index be6b982..56989fa 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.
@@ -9,22 +11,27 @@
 # "no filename shall be longer than eight and a suffix if present
 # not longer than three".
 
+# The 8-level depth rule is for older VMS systems that likely won't
+# even be able to unpack the tarball if more than eight levels 
+# (including the top of the source tree) are present.
+
 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");
@@ -47,8 +54,13 @@ if (open(MANIFEST, "MANIFEST")) {
 	    print "more than one dot: $_\n";
 	    next;
 	}
+	if ((my $slashes = $_ =~ tr|\/|\/|) > 7) {
+	    print "more than eight levels deep: $_\n";
+	    next;
+	}
 	while (m!/|\z!g) {
 	    my ($dir, $edt) = eight_dot_three($`);
+	    next unless defined $dir;
 	    ($dir, $edt) = map { lc } ($dir, $edt);
 	    push @{$dir{$dir}->{$edt}}, $_;
 	}
@@ -59,9 +71,9 @@ if (open(MANIFEST, "MANIFEST")) {
 
 for my $dir (sort keys %dir) {
     for my $edt (keys %{$dir{$dir}}) {
-	my @files = @{$dir{$dir}->{$edt}};
+	my @files = @{$dir{$dir}{$edt}};
 	if (@files > 1) {
-	    print "directory $dir conflict $edt: @files\n";
+	    print "conflict on filename $edt:\n", map "    $_\n", @files;
 	}
     }
 }