X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=Porting%2Fcheck83.pl;h=56989fa9e07a9720fc179c2bdc431347ba9f5b7f;hb=07962d9a9be57321e306c86241903a78862dad8e;hp=0522bc0d3367dc85355f669092aab49d900a77be;hpb=4d8cc5f8cae495ff0bcad4a9e629ad4bab92c057;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/Porting/check83.pl b/Porting/check83.pl
index 0522bc0..56989fa 100644
--- a/Porting/check83.pl
+++ b/Porting/check83.pl
@@ -1,21 +1,37 @@
-#!/usr/local/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.
 
+# The "8.3 rule" is loose: "if reducing the directory entry names
+# within one directory to lowercase and 8.3-truncated causes
+# conflicts, that's a bad thing".  So the rule is NOT the strict
+# "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 {
-    my ($dir, $base, $ext) = ($_[0] =~ m!^(?:(.+)/)?([^/.]+)(?:\.([^/.]+))?$!);
-    my $file = $base . defined $ext ? ".$ext" : "";
+    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 =~ /\./)  {
-	warn "$dir: directory name contains '.'\n";
+    if (defined $dir && $dir =~ /\./)  {
+	print "directory name contains '.': $dir\n";
     }
     if ($file =~ /[^A-Za-z0-9\._-]/) {
-	warn "$file: filename contains non-portable characters\n";
+	print "filename contains non-portable characters: $_[0]\n";
     }
-    if (length $file > 30) {
-	warn "$file: filename longer than 30 characters\n";
+    if (length $file > $maxl) {
+	print "filename longer than $maxl characters: $file\n";
     }
     if (defined $dir) {
 	return ($dir, defined $ext ? "$dir/$base.$ext" : "$dir/$base");
@@ -31,16 +47,23 @@ if (open(MANIFEST, "MANIFEST")) {
 	chomp;
 	s/\s.+//;
 	unless (-f) {
-	    warn "$_: missing\n";
+	    print "missing: $_\n";
 	    next;
 	}
 	if (tr/././ > 1) {
-	    print "$_: more than one dot\n";
+	    print "more than one dot: $_\n";
 	    next;
 	}
-	my ($dir, $edt) = eight_dot_three($_);
-	($dir, $edt) = map { lc } ($dir, $edt);
-	push @{$dir{$dir}->{$edt}}, $_;
+	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}}, $_;
+	}
     }
 } else {
     die "$0: MANIFEST: $!\n";
@@ -48,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 "@files: directory $dir conflict $edt\n";
+	    print "conflict on filename $edt:\n", map "    $_\n", @files;
 	}
     }
 }