pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-16 01:01:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add string util search_deliminated_string (#1260)

Browse Source 
This function takes a string of deliminated an see if another string is
one of those

This function also verifies it's not finding a substring
This commit is contained in:
Michael Cook (mackal) 2021-02-23 12:52:34 -05:00 committed by GitHub
parent 1cfdd7e4a2
commit 74ce20b256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/string_util.cpp
View File

@ -125,6 +125,19 @@ std::vector<std::string> SplitString(const std::string &str, char delim) {
return ret;
}
std::string::size_type search_deliminated_string(const std::string &haystack, const std::string &needle, const char deliminator)
{
// this shouldn't go out of bounds, even without obvious bounds checks
auto pos = haystack.find(needle);
while (pos != std::string::npos) {
auto c = haystack[pos + needle.length()];
if ((c == '\0' || c == deliminator) && (pos == 0 || haystack[pos - 1] == deliminator))
return pos;
pos = haystack.find(needle, pos + needle.length());
}
return std::string::npos;
}
std::string implode(std::string glue, std::vector<std::string> src)
{
if (src.empty()) {

1
common/string_util.h
View File

@ -178,6 +178,7 @@ std::vector<std::string> join_tuple(const std::string &glue, const std::pair<cha
}
std::vector<std::string> SplitString(const std::string &s, char delim);
std::string::size_type search_deliminated_string(const std::string &haystack, const std::string &needle, const char deliminator = ',');
std::string EscapeString(const char *src, size_t sz);
std::string EscapeString(const std::string &s);
bool StringIsNumber(const std::string &s);

28
tests/string_util_test.h
View File

@ -29,6 +29,7 @@ public:
TEST_ADD(StringUtilTest::StringFormatTest);
TEST_ADD(StringUtilTest::EscapeStringTest);
TEST_ADD(StringUtilTest::EscapeStringMemoryTest);
TEST_ADD(StringUtilTest::SearchDeliminatedStringTest);
}
~StringUtilTest() {
@ -80,6 +81,33 @@ public:
auto s = EscapeString(t, 10);
TEST_ASSERT(s.compare("abc\\x00\\n\\r\\\\\\'\\\"\\x1a") == 0);
}
void SearchDeliminatedStringTest() {
std::string h =
"befallen,charasis,dalnir,frontiermtns,gukbottom,iceclad,lakeofillomen,northkarana,qey2hh1,soldunga,southro,wakening,podisease,velketor,akheva,riwwi,bothunder,poair";
TEST_ASSERT(search_deliminated_string(h, "befallen") == 0);
TEST_ASSERT(search_deliminated_string(h, "charasis") == 9);
TEST_ASSERT(search_deliminated_string(h, "dalnir") == 18);
TEST_ASSERT(search_deliminated_string(h, "frontiermtns") == 25);
TEST_ASSERT(search_deliminated_string(h, "gukbottom") == 38);
TEST_ASSERT(search_deliminated_string(h, "iceclad") == 48);
TEST_ASSERT(search_deliminated_string(h, "lakeofillomen") == 56);
TEST_ASSERT(search_deliminated_string(h, "northkarana") == 70);
TEST_ASSERT(search_deliminated_string(h, "qey2hh1") == 82);
TEST_ASSERT(search_deliminated_string(h, "soldunga") == 90);
TEST_ASSERT(search_deliminated_string(h, "southro") == 99);
TEST_ASSERT(search_deliminated_string(h, "wakening") == 107);
TEST_ASSERT(search_deliminated_string(h, "podisease") == 116);
TEST_ASSERT(search_deliminated_string(h, "velketor") == 126);
TEST_ASSERT(search_deliminated_string(h, "akheva") == 135);
TEST_ASSERT(search_deliminated_string(h, "riwwi") == 142);
TEST_ASSERT(search_deliminated_string(h, "bothunder") == 148);
TEST_ASSERT(search_deliminated_string(h, "poair") == 158);
TEST_ASSERT(search_deliminated_string(h, "pod") == std::string::npos);
TEST_ASSERT(search_deliminated_string(h, "air") == std::string::npos);
TEST_ASSERT(search_deliminated_string(h, "bef") == std::string::npos);
TEST_ASSERT(search_deliminated_string(h, "wwi") == std::string::npos);
}
};
#endif