spamassassin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j.@apache.org
Subject svn commit: r431575 - /spamassassin/branches/jm_re2c_hacks/rule2xs/re2xs
Date Tue, 15 Aug 2006 11:09:22 GMT
Author: jm
Date: Tue Aug 15 04:09:22 2006
New Revision: 431575

URL: http://svn.apache.org/viewvc?rev=431575&view=rev
Log:
support 'foo?' escape in re2xs

Modified:
    spamassassin/branches/jm_re2c_hacks/rule2xs/re2xs

Modified: spamassassin/branches/jm_re2c_hacks/rule2xs/re2xs
URL: http://svn.apache.org/viewvc/spamassassin/branches/jm_re2c_hacks/rule2xs/re2xs?rev=431575&r1=431574&r2=431575&view=diff
==============================================================================
--- spamassassin/branches/jm_re2c_hacks/rule2xs/re2xs (original)
+++ spamassassin/branches/jm_re2c_hacks/rule2xs/re2xs Tue Aug 15 04:09:22 2006
@@ -222,7 +222,9 @@
   # this must be fatal; it can result in corrupt output modules missing
   # scannerN() functions
   if ($? >> 8 != 0) {
-    die "'$cmd' failed, dying";
+    my $cwd = `pwd`; chop $cwd;
+    die "'$cmd' failed, dying!\n".
+        "see $cwd/scanner$_.re\n";
   }
 }
 
@@ -374,7 +376,7 @@
   # print "FIXUP: $re\n";
   
   my $output = "";
-  my $TOK = qr([\{\^\$\"\(\)\[\|\\\.\+\*]);
+  my $TOK = qr([\{\^\$\"\(\)\[\|\\\.\+\*\?]);
   
   my $STATE;
   while ($re =~ /\G(.*?)($TOK)/gc) {
@@ -432,6 +434,9 @@
     }
     elsif ($tok eq '*') {
       $output .= '* ';
+    }
+    elsif ($tok eq '?') {
+      $output .= '? ';
     }
     elsif ($tok eq '+') {
       $output .= '+ ';



Mime
View raw message