i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mail: Remove regex match limitation from the BeOS days.

Browse Source 
It was still enabled on 32-bit x86...
This commit is contained in:
Augustin Cavalier
2018-11-10 15:00:49 -05:00
parent 1801b9565c
commit 231ee3b8ad
1 changed files with 16 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/mail_daemon/inbound_filters/match_header/StringMatcher.cpp
+16 -26
View File
@@ -1,5 +1,5 @@
//--------This file shamelessly stolen from Jeremy Friesner's excellent MUSCLE--------- //--------This file shamelessly stolen from Jeremy Friesner's excellent MUSCLE---------
/* This file is Copyright 2000 Level Control Systems. See the included LICENSE.txt file for details. */ /* This file is Copyright 2000 Level Control Systems. See the included LICENSE.txt file for details. */
#include <new> #include <new>
#include <stdio.h> #include <stdio.h>
@@ -12,7 +12,7 @@
StringMatcher::StringMatcher() : _regExpValid(false) StringMatcher::StringMatcher() : _regExpValid(false)
{ {
// empty // empty
} }
StringMatcher :: StringMatcher(const char * str) : _regExpValid(false) StringMatcher :: StringMatcher(const char * str) : _regExpValid(false)
{ {
@@ -24,7 +24,7 @@ StringMatcher::~StringMatcher()
if (_regExpValid) regfree(&_regExp); if (_regExpValid) regfree(&_regExp);
} }
bool StringMatcher::SetPattern(const char * str, bool isSimple) bool StringMatcher::SetPattern(const char * str, bool isSimple)
{ {
PortableString pattern; PortableString pattern;
@@ -36,14 +36,14 @@ bool StringMatcher::SetPattern(const char * str, bool isSimple)
for (const char * ptr = str; *ptr != '\0'; ptr++) for (const char * ptr = str; *ptr != '\0'; ptr++)
{ {
if (escapeMode) if (escapeMode)
{ {
escapeMode = false; escapeMode = false;
switch(*ptr) switch(*ptr)
{ {
case ',': case '|': case '(': case ')': case '?': case ',': case '|': case '(': case ')': case '?':
pattern += *ptr; pattern += *ptr;
break; break;
default: default:
pattern += '\\'; pattern += '\\';
pattern += *ptr; pattern += *ptr;
@@ -52,32 +52,32 @@ bool StringMatcher::SetPattern(const char * str, bool isSimple)
} }
else else
{ {
switch(*ptr) switch(*ptr)
{ {
case ',': case '|': case ',': case '|':
pattern += "\\|"; pattern += "\\|";
break; break;
case '.': case '(': case ')': case '.': case '(': case ')':
pattern += '\\'; pattern += '\\';
pattern += *ptr; pattern += *ptr;
break; break;
case '*': case '*':
pattern += ".*"; pattern += ".*";
break; break;
case '?': case '?':
pattern += '.'; pattern += '.';
break; break;
case '\\': case '\\':
escapeMode = true; escapeMode = true;
break; break;
break; break;
default: default:
pattern += *ptr; pattern += *ptr;
break; break;
} }
@@ -88,7 +88,7 @@ bool StringMatcher::SetPattern(const char * str, bool isSimple)
} }
// Free the old regular expression, if any // Free the old regular expression, if any
if (_regExpValid) if (_regExpValid)
{ {
regfree(&_regExp); regfree(&_regExp);
_regExpValid = false; _regExpValid = false;
@@ -103,23 +103,13 @@ bool StringMatcher::SetPattern(const char * str, bool isSimple)
bool bool
StringMatcher::Match(const char *str) const StringMatcher::Match(const char *str) const
{ {
#ifdef __INTEL__
char buffer[1024];
if (strlen(str) > 1024) {
// internal Be regex seems to be broken with strings larger than a certain size :-/
memcpy(buffer, str, 1023);
buffer[1023] = '\0';
str = buffer;
}
#endif
if (_regExpValid == false) if (_regExpValid == false)
return false; return false;
int regExpStat = regexec(&_regExp, str, 0, NULL, 0); int regExpStat = regexec(&_regExp, str, 0, NULL, 0);
return (regExpStat != REG_NOMATCH); return (regExpStat != REG_NOMATCH);
} }
bool IsRegexToken(char c) bool IsRegexToken(char c)