Find more conflicts by lowercasing.

p4raw-id: //depot/perl@12131

diff --git a/MANIFEST b/MANIFEST
index cdd65fafc68b0ab42233a50d8f2d5918589d3b36..3b8fecc5150272070684a1127aa835a86961a81e 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -15,7 +15,6 @@ Changes5.003          Differences between 5.002 and 5.003
 Changes5.004           Differences between 5.003 and 5.004
 Changes5.005           Differences between 5.004 and 5.005
 Changes5.6             Differences between 5.005 and 5.6
-check83.pl             Check whether we are 8.3-friendly
 configpm               Produces lib/Config.pm
 Configure              Portability tool
 configure.com          Configure-equivalent for VMS
@@ -572,10 +571,10 @@ ext/Thread/unsync4.tx             Test thread implicit synchronisation
 ext/threads/Changes            ithreads
 ext/threads/Makefile.PL                ithreads
 ext/threads/README             ithreads
+ext/threads/t/basic.t          ithreads
 ext/threads/threads.h          ithreads
 ext/threads/threads.pm          ithreads
 ext/threads/threads.xs         ithreads
-ext/threads/t/basic.t          ithreads
 ext/Time/HiRes/Changes         Time::HiRes extension
 ext/Time/HiRes/hints/dynixptx.pl       Hint for Time::HiRes for named architecture
 ext/Time/HiRes/hints/sco.pl    Hints for Time::HiRes for named architecture
@@ -1843,6 +1842,7 @@ pod/splitman                      Splits perlfunc into multiple man pages
 pod/splitpod                   Splits perlfunc into multiple pod pages
 Policy_sh.SH           Hold site-wide preferences between Configure runs.
 Porting/apply          Apply patches sent by mail
+Porting/check83.pl     Check whether we are 8.3-friendly
 Porting/config.sh      Sample config.sh
 Porting/config_H       Sample config.h
 Porting/Contract       Social contract for contributed modules in Perl core

diff --git a/Porting/check83.pl b/Porting/check83.pl
new file mode 100644 (file)
index 0000000..51b2b11
--- /dev/null
+++ b/Porting/check83.pl
@@ -0,0 +1,46 @@
+#!/usr/local/bin/perl
+
+# Check whether there are naming conflicts when names are truncated
+# to the DOSish case-ignoring 8.3 format
+
+sub eight_dot_three {
+    my ($dir, $base, $ext) = ($_[0] =~ m!^(?:(.+)/)?([^/.]+)(?:\.([^/.]+))?$!);
+    $base = substr($base, 0, 8);
+    $ext  = substr($ext,  0, 3) if defined $ext;
+    if (defined $dir) {
+       return ($dir, defined $ext ? "$dir/$base.$ext" : "$dir/$base");
+    } else {
+       return ('.', defined $ext ? "$base.$ext" : $base);
+    }
+}
+
+my %dir;
+
+if (open(MANIFEST, "MANIFEST")) {
+    while (<MANIFEST>) {
+       chomp;
+       s/\s.+//;
+       unless (-f) {
+           warn "$_: missing\n";
+           next;
+       }
+       if (tr/././ > 1) {
+           print "$_: more than one dot\n";
+           next;
+       }
+       my ($dir, $edt) = eight_dot_three($_);
+       ($dir, $edt) = map { lc } ($dir, $edt);
+       push @{$dir{$dir}->{$edt}}, $_;
+    }
+} else {
+    die "$0: MANIFEST: $!\n";
+}
+
+for my $dir (sort keys %dir) {
+    for my $edt (keys %{$dir{$dir}}) {
+       my @files = @{$dir{$dir}->{$edt}};
+       if (@files > 1) {
+           print "@files: directory $dir conflict $edt\n";
+       }
+    }
+}

diff --git a/check83.pl b/check83.pl
deleted file mode 100644 (file)
index 69e00c6..0000000
--- a/check83.pl
+++ /dev/null
@@ -1,41 +0,0 @@
-sub eight_dot_three {
-    my ($dir, $base, $ext) = ($_[0] =~ m!^(?:(.+)/)?([^/.]+)(?:\.([^/.]+))?$!);
-    $base = substr($base, 0, 8);
-    $ext  = substr($ext,  0, 3) if defined $ext;
-    if (defined $dir) {
-       return ($dir, defined $ext ? "$dir/$base.$ext" : "$dir/$base");
-    } else {
-       return ('.', defined $ext ? "$base.$ext" : $base);
-    }
-}
-
-my %dir;
-
-if (open(MANIFEST, "MANIFEST")) {
-    while (<MANIFEST>) {
-       chomp;
-       s/\s.+//;
-       unless (-f) {
-           warn "$_: missing\n";
-           next;
-       }
-       if (tr/././ > 1) {
-           warn "$_: more than one dot\n";
-           next;
-       }
-       my ($dir, $edt) = eight_dot_three($_);
-       next if $edt eq $_;
-       push @{$dir{$dir}->{$edt}}, $_;
-    }
-} else {
-    die "$0: MANIFEST: $!\n";
-}
-
-for my $dir (sort keys %dir) {
-    for my $edt (keys %{$dir{$dir}}) {
-       my @files = @{$dir{$dir}->{$edt}};
-       if (@files > 1) {
-           print "$dir $edt @files\n";
-       }
-    }
-}