Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'topic/AbdelSaTd/case-insensitive-find'

Browse source 
* topic/AbdelSaTd/case-insensitive-find:
  testing-do-find-str_case-insensitive
  case-insensitive-search-features-for-do_find_str

I did a few small style-fixes while merging this and expanded the test
a bit. I also removed unecessary commits.

Closes GH-1828
This commit is contained in:
Johanna Amann 2021-11-10 11:28:52 +00:00
commit d451fb8184
6 changed files with 78 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/strings.bif
View file

@ -1145,7 +1145,7 @@ function count_substr%(str: string, sub: string%) : count
%%{
static int64_t do_find_str(zeek::StringVal* str, zeek::StringVal* sub, int64_t start, int64_t end, bool rfind)
static int64_t do_find_str(zeek::StringVal* str, zeek::StringVal* sub, int64_t start, int64_t end, bool rfind, bool case_sensitive)
{
// Don't bother if the start is after the end of the string.
if ( start > str->Len() )
@ -1168,11 +1168,19 @@ static int64_t do_find_str(zeek::StringVal* str, zeek::StringVal* sub, int64_t s
return -1;
string s = str->ToStdString().substr(start, end_pos);
string sb = sub->ToStdString();
size_t pos = string::npos;
if ( ! case_sensitive )
{
transform(s.begin(), s.end(), s.begin(), ::tolower);
transform(sb.begin(), sb.end(), sb.begin(), ::tolower);
}
if ( rfind )
pos = s.rfind(sub->ToStdString());
pos = s.rfind(sb);
else
pos = s.find(sub->ToStdString());
pos = s.find(sb);
if ( pos == string::npos )
return -1;
@ -1193,13 +1201,16 @@ static int64_t do_find_str(zeek::StringVal* str, zeek::StringVal* sub, int64_t s
## end: An optional position for the end of the substring. A value less than
## zero (such as the default -1) means a search until the end of the
## string.
## case_sensitive: Set to false to perform a case-insensitive search.
## (default: T). Note that case-insensitive searches use the
## ``tolower`` libc function, which is locale-sensitive.
##
## Returns: The position of the substring. Returns -1 if the string wasn't
## found. Prints an error if the starting position is after the ending
## position.
function find_str%(str: string, sub: string, start: count &default=0, end: int &default=-1%) : int
function find_str%(str: string, sub: string, start: count &default=0, end: int &default=-1, case_sensitive: bool &default=T%) : int
%{
return zeek::val_mgr->Int(do_find_str(str, sub, start, end, false));
return zeek::val_mgr->Int(do_find_str(str, sub, start, end, false, case_sensitive));
%}
## The same as :zeek:see:`find_str`, but returns the highest index matching
@ -1210,13 +1221,16 @@ function find_str%(str: string, sub: string, start: count &default=0, end: int &
## start: An optional position for the start of the substring.
## end: An optional position for the end of the substring. A value less than
## zero (such as the default -1) means a search from the end of the string.
## case_sensitive: Set to false to perform a case-insensitive search.
## (default: T). Note that case-insensitive searches use the
## ``tolower`` libc function, which is locale-sensitive.
##
## Returns: The position of the substring. Returns -1 if the string wasn't
## found. Prints an error if the starting position is after the ending
## position.
function rfind_str%(str: string, sub: string, start: count &default=0, end: int &default=-1%) : int
function rfind_str%(str: string, sub: string, start: count &default=0, end: int &default=-1, case_sensitive: bool &default=T%) : int
%{
return zeek::val_mgr->Int(do_find_str(str, sub, start, end, true));
return zeek::val_mgr->Int(do_find_str(str, sub, start, end, true, case_sensitive));
%}
## Returns whether a string starts with a substring.