X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FFile%2FBasename.pm;h=d842844daf130a1d123fa2181a2c4ca6a90cd38e;hb=0105f2b1236b169342446129a0de2fd073540afd;hp=b3fe0ac6e5907fa0b663b8aa8fe0c0f56f72328f;hpb=a049506658d2a1f1262d7635971158f305c441f6;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/File/Basename.pm b/lib/File/Basename.pm
index b3fe0ac..d842844 100644
--- a/lib/File/Basename.pm
+++ b/lib/File/Basename.pm
@@ -37,13 +37,13 @@ is equivalent to the original path for all systems but VMS.
 
 package File::Basename;
 
-# A bit of juggling to insure that C<use re 'taint';> always works, since
 # File::Basename is used during the Perl build, when the re extension may
-# not be available.
+# not be available, but we only actually need it if running under tainting.
 BEGIN {
-  unless (eval { require re; })
-    { eval ' sub re::import { $^H |= 0x00100000; } ' } # HINT_RE_TAINT
-  import re 'taint';
+  if (${^TAINT}) {
+    require re;
+    re->import('taint');
+  }
 }
 
 
@@ -54,7 +54,7 @@ our(@ISA, @EXPORT, $VERSION, $Fileparse_fstype, $Fileparse_igncase);
 require Exporter;
 @ISA = qw(Exporter);
 @EXPORT = qw(fileparse fileparse_set_fstype basename dirname);
-$VERSION = "2.77";
+$VERSION = "2.78";
 
 fileparse_set_fstype($^O);