perl 5.000perl-5.000

[editor's note: this commit combines approximate 4 months of furious
releases of Andy Dougherty and Larry Wall - see pod/perlhist.pod for
details.  Andy notes that;
 
Alas neither my "Irwin AccuTrack" nor my DC 600A quarter-inch cartridge 
backup tapes from that era seem to be readable anymore.  I guess 13 years 
exceeds the shelf life for that backup technology :-(.
]

1 files changed, 13 insertions, 3 deletions

diff --git a/lib/AutoLoader.pm b/lib/AutoLoader.pm
index dba8ca2f5f..3f5eef2375 100644
--- a/lib/AutoLoader.pm
+++ b/lib/AutoLoader.pm
@@ -1,13 +1,23 @@
 package AutoLoader;
+use Carp;
 
 AUTOLOAD {
     my $name = "auto/$AUTOLOAD.al";
     $name =~ s#::#/#g;
     eval {require $name};
     if ($@) {
-	($p,$f,$l) = caller($AutoLevel);
-	$@ =~ s/ at .*\n//;
-	die "$@ at $f line $l\n";
+	# The load might just have failed because the filename was too
+	# long for some old SVR3 systems which treat long names as errors.
+	# If we can succesfully truncate a long name then it's worth a go.
+	# There is a slight risk that we could pick up the wrong file here
+	# but autosplit should have warned about that when splitting.
+	if ($name =~ s/(\w{12,})\.al$/substr($1,0,11).".al"/e){
+	    eval {require $name};
+	}
+	if ($@){
+	    $@ =~ s/ at .*\n//;
+	    croak $@;
+	}
     }
     goto &$AUTOLOAD;
 }