1 files changed, 28 insertions, 25 deletions

diff --git a/lib/File/DosGlob.pm b/lib/File/DosGlob.pm
index d7dea7b46c..3401b5fe9e 100644
--- a/lib/File/DosGlob.pm
+++ b/lib/File/DosGlob.pm
@@ -6,49 +6,51 @@
 
 package File::DosGlob;
 
+our $VERSION = '1.00';
+use strict;
+
 sub doglob {
     my $cond = shift;
     my @retval = ();
     #print "doglob: ", join('|', @_), "\n";
   OUTER:
-    for my $arg (@_) {
-        local $_ = $arg;
+    for my $pat (@_) {
 	my @matched = ();
 	my @globdirs = ();
 	my $head = '.';
 	my $sepchr = '/';
-	next OUTER unless defined $_ and $_ ne '';
+        my $tail;
+	next OUTER unless defined $pat and $pat ne '';
 	# if arg is within quotes strip em and do no globbing
-	if (/^"(.*)"\z/s) {
-	    $_ = $1;
-	    if ($cond eq 'd') { push(@retval, $_) if -d $_ }
-	    else              { push(@retval, $_) if -e $_ }
+	if ($pat =~ /^"(.*)"\z/s) {
+	    $pat = $1;
+	    if ($cond eq 'd') { push(@retval, $pat) if -d $pat }
+	    else              { push(@retval, $pat) if -e $pat }
 	    next OUTER;
 	}
 	# wildcards with a drive prefix such as h:*.pm must be changed
 	# to h:./*.pm to expand correctly
-	if (m|^([A-Za-z]:)[^/\\]|s) {
+	if ($pat =~ m|^([A-Za-z]:)[^/\\]|s) {
 	    substr($_,0,2) = $1 . "./";
 	}
-	if (m|^(.*)([\\/])([^\\/]*)\z|s) {
-	    my $tail;
+	if ($pat =~ m|^(.*)([\\/])([^\\/]*)\z|s) {
 	    ($head, $sepchr, $tail) = ($1,$2,$3);
 	    #print "div: |$head|$sepchr|$tail|\n";
-	    push (@retval, $_), next OUTER if $tail eq '';
+	    push (@retval, $pat), next OUTER if $tail eq '';
 	    if ($head =~ /[*?]/) {
 		@globdirs = doglob('d', $head);
 		push(@retval, doglob($cond, map {"$_$sepchr$tail"} @globdirs)),
 		    next OUTER if @globdirs;
 	    }
 	    $head .= $sepchr if $head eq '' or $head =~ /^[A-Za-z]:\z/s;
-	    $_ = $tail;
+	    $pat = $tail;
 	}
 	#
 	# If file component has no wildcards, we can avoid opendir
-	unless (/[*?]/) {
+	unless ($pat =~ /[*?]/) {
 	    $head = '' if $head eq '.';
 	    $head .= $sepchr unless $head eq '' or substr($head,-1) eq $sepchr;
-	    $head .= $_;
+	    $head .= $pat;
 	    if ($cond eq 'd') { push(@retval,$head) if -d $head }
 	    else              { push(@retval,$head) if -e $head }
 	    next OUTER;
@@ -60,14 +62,13 @@ sub doglob {
 	$head .= $sepchr unless $head eq '' or substr($head,-1) eq $sepchr;
 
 	# escape regex metachars but not glob chars
-	s:([].+^\-\${}[|]):\\$1:g;
+        $pat =~ s:([].+^\-\${}[|]):\\$1:g;
 	# and convert DOS-style wildcards to regex
-	s/\*/.*/g;
-	s/\?/.?/g;
+	$pat =~ s/\*/.*/g;
+	$pat =~ s/\?/.?/g;
 
-	#print "regex: '$_', head: '$head'\n";
-	my $matchsub = eval 'sub { $_[0] =~ m|^' . $_ . '\\z|ios }';
-	warn($@), next OUTER if $@;
+	#print "regex: '$pat', head: '$head'\n";
+	my $matchsub = sub { $_[0] =~ m|^$pat\z|is };
       INNER:
 	for my $e (@leaves) {
 	    next INNER if $e eq '.' or $e eq '..';
@@ -80,7 +81,7 @@ sub doglob {
 	    # has a dot *and* name is shorter than 9 chars.
 	    #
 	    if (index($e,'.') == -1 and length($e) < 9
-	        and index($_,'\\.') != -1) {
+	        and index($pat,'\\.') != -1) {
 		push(@matched, "$head$e"), next INNER if &$matchsub("$e.");
 	    }
 	}
@@ -100,8 +101,7 @@ my %iter;
 my %entries;
 
 sub glob {
-    my $pat = shift;
-    my $cxix = shift;
+    my($pat,$cxix) = @_;
     my @pat;
 
     # glob without args defaults to $_
@@ -143,14 +143,17 @@ sub glob {
     }
 }
 
-sub import {
+{
+    no strict 'refs';
+
+    sub import {
     my $pkg = shift;
     return unless @_;
     my $sym = shift;
     my $callpkg = ($sym =~ s/^GLOBAL_//s ? 'CORE::GLOBAL' : caller(0));
     *{$callpkg.'::'.$sym} = \&{$pkg.'::'.$sym} if $sym eq 'glob';
+    }
 }
-
 1;
 
 __END__