NetWare update from Ananth Kesari.

p4raw-id: //depot/perl@17376

1 files changed, 6 insertions, 14 deletions

diff --git a/ext/DynaLoader/DynaLoader_pm.PL b/ext/DynaLoader/DynaLoader_pm.PL
index 2bed9915e6..05fe3f7c65 100644
--- a/ext/DynaLoader/DynaLoader_pm.PL
+++ b/ext/DynaLoader/DynaLoader_pm.PL
@@ -237,6 +237,7 @@ sub bootstrap {
     # It may also edit @modparts if required.
     $modfname = &mod2fname(\@modparts) if defined &mod2fname;
 
+    # Truncate the module name to 8.3 format for NetWare
 	if (($^O eq 'NetWare') && (length($modfname) > 8)) {
 		$modfname = substr($modfname, 0, 8);
 	}
@@ -262,22 +263,13 @@ sub bootstrap {
 	} else {
 	    $dir = "$_/auto/$modpname";
 	}
-	if ($^O ne 'NetWare') {
-		next unless -d $dir; # skip over uninteresting directories
-	}
-	else {
-		next if -f $dir; # skip over uninteresting directories
-	}
-
+	
+	next unless -d $dir; # skip over uninteresting directories
+	
 	# check for common cases to avoid autoload of dl_findfile
 	my $try = $Is_MacOS ? "$dir:$modfname.$dl_dlext" : "$dir/$modfname.$dl_dlext";
-	if ($^O ne 'NetWare') {
-		last if $file = ($do_expand) ? dl_expandspec($try) : ((-f $try) && $try);
-	}
-	elsif (!(-d $try)) {
-		last if $file = ($do_expand) ? dl_expandspec($try) : ($try);
-	}
-
+	last if $file = ($do_expand) ? dl_expandspec($try) : ((-f $try) && $try);
+	
 	# no luck here, save dir for possible later dl_findfile search
 	push @dirs, $dir;
     }