3 files changed, 37 insertions, 22 deletions

diff --git a/contrib/perl5/ext/re/Makefile.PL b/contrib/perl5/ext/re/Makefile.PL
index 040b085..bd0f1f7 100644
--- a/contrib/perl5/ext/re/Makefile.PL
+++ b/contrib/perl5/ext/re/Makefile.PL
@@ -5,7 +5,7 @@ WriteMakefile(
     MAN3PODS		=> {}, 	# Pods will be built by installman.
     XSPROTOARG		=> '-noprototypes',
     OBJECT		=> 're_exec$(OBJ_EXT) re_comp$(OBJ_EXT) re$(OBJ_EXT)',
-    DEFINE		=> '-DPERL_EXT_RE_BUILD',
+    DEFINE		=> '-DPERL_EXT_RE_BUILD -DPERL_EXT_RE_DEBUG',
     clean		=> { FILES => '*$(OBJ_EXT) *.c ../../lib/re.pm' },
 );
 
diff --git a/contrib/perl5/ext/re/re.pm b/contrib/perl5/ext/re/re.pm
index 83e7dba..3f142d9 100644
--- a/contrib/perl5/ext/re/re.pm
+++ b/contrib/perl5/ext/re/re.pm
@@ -41,11 +41,11 @@ on tainted data aren't meant to extract safe substrings, but to perform
 other transformations.
 
 When C<use re 'eval'> is in effect, a regex is allowed to contain
-C<(?{ ... })> zero-width assertions even if the regex contains
-variable interpolation.  This is normally disallowed, since it is a 
+C<(?{ ... })> zero-width assertions even if regular expression contains
+variable interpolation.  That is normally disallowed, since it is a 
 potential security risk.  Note that this pragma is ignored when the regular
 expression is obtained from tainted data, i.e.  evaluation is always
-disallowed with tainted regular expressions.  See L<perlre/(?{ code })>.
+disallowed with tainted regular expresssions.  See L<perlre/(?{ code })>.
 
 For the purpose of this pragma, interpolation of precompiled regular 
 expressions (i.e., the result of C<qr//>) is I<not> considered variable
@@ -74,6 +74,8 @@ See L<perlmodlib/Pragmatic Modules>.
 
 =cut
 
+# N.B. File::Basename contains a literal for 'taint' as a fallback.  If
+# taint is changed here, File::Basename must be updated as well.
 my %bitmask = (
 taint	=> 0x00100000,
 eval	=> 0x00200000,
@@ -84,16 +86,13 @@ sub setcolor {
   require Term::Cap;
 
   my $terminal = Tgetent Term::Cap ({OSPEED => 9600}); # Avoid warning.
-  my $props = $ENV{PERL_RE_TC} || 'md,me,so,se'; # can use us/ue later
+  my $props = $ENV{PERL_RE_TC} || 'md,me,so,se,us,ue';
   my @props = split /,/, $props;
+  my $colors = join "\t", map {$terminal->Tputs($_,1)} @props;
 
-
-  $ENV{TERMCAP_COLORS} = join "\t", map {$terminal->Tputs($_,1)} @props;
+  $colors =~ s/\0//g;
+  $ENV{PERL_RE_COLORS} = $colors;
  };
-
- not defined $ENV{TERMCAP_COLORS} or ($ENV{TERMCAP_COLORS} =~ tr/\t/\t/) >= 4
-    or not defined $ENV{PERL_RE_TC}
-    or die "Not enough fields in \$ENV{PERL_RE_TC}=`$ENV{PERL_RE_TC}'";
 }
 
 sub bits {
@@ -106,9 +105,8 @@ sub bits {
     foreach my $s (@_){
       if ($s eq 'debug' or $s eq 'debugcolor') {
  	  setcolor() if $s eq 'debugcolor';
-	  require DynaLoader;
-	  @ISA = ('DynaLoader');
-	  bootstrap re;
+	  require XSLoader;
+	  XSLoader::load('re');
 	  install() if $on;
 	  uninstall() unless $on;
 	  next;
diff --git a/contrib/perl5/ext/re/re.xs b/contrib/perl5/ext/re/re.xs
index 7230d62..04a5fdc 100644
--- a/contrib/perl5/ext/re/re.xs
+++ b/contrib/perl5/ext/re/re.xs
@@ -3,36 +3,49 @@
 #  define DEBUGGING
 #endif
 
+#define PERL_NO_GET_CONTEXT
 #include "EXTERN.h"
 #include "perl.h"
 #include "XSUB.h"
 
-extern regexp*	my_regcomp _((char* exp, char* xend, PMOP* pm));
-extern I32	my_regexec _((regexp* prog, char* stringarg, char* strend,
-			      char* strbeg, I32 minend, SV* screamer,
-			      void* data, U32 flags));
+extern regexp*	my_regcomp (pTHX_ char* exp, char* xend, PMOP* pm);
+extern I32	my_regexec (pTHX_ regexp* prog, char* stringarg, char* strend,
+			    char* strbeg, I32 minend, SV* screamer,
+			    void* data, U32 flags);
+extern void	my_regfree (pTHX_ struct regexp* r);
+extern char*	my_re_intuit_start (pTHX_ regexp *prog, SV *sv, char *strpos,
+				    char *strend, U32 flags,
+				    struct re_scream_pos_data_s *data);
+extern SV*	my_re_intuit_string (pTHX_ regexp *prog);
 
 static int oldfl;
 
 #define R_DB 512
 
 static void
-deinstall(void)
+deinstall(pTHX)
 {
     dTHR;
-    PL_regexecp = &regexec_flags;
-    PL_regcompp = &pregcomp;
+    PL_regexecp = Perl_regexec_flags;
+    PL_regcompp = Perl_pregcomp;
+    PL_regint_start = Perl_re_intuit_start;
+    PL_regint_string = Perl_re_intuit_string;
+    PL_regfree = Perl_pregfree;
+
     if (!oldfl)
 	PL_debug &= ~R_DB;
 }
 
 static void
-install(void)
+install(pTHX)
 {
     dTHR;
     PL_colorset = 0;			/* Allow reinspection of ENV. */
     PL_regexecp = &my_regexec;
     PL_regcompp = &my_regcomp;
+    PL_regint_start = &my_re_intuit_start;
+    PL_regint_string = &my_re_intuit_string;
+    PL_regfree = &my_regfree;
     oldfl = PL_debug & R_DB;
     PL_debug |= R_DB;
 }
@@ -41,6 +54,10 @@ MODULE = re	PACKAGE = re
 
 void
 install()
+  CODE:
+    install(aTHX);
 
 void
 deinstall()
+  CODE:
+    deinstall(aTHX);