starred/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-10-28 02:31:25 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

FFstrbuf: improves empty-string handling

Browse Source 
for ffStrbufMatchSeparatedNS and ffStrbufSeparatedContainNS

Fixes #2585
This commit is contained in:
Carter Li
2026-09-15 10:33:00 +08:00
parent 416715a505
commit fbf79ac6fe
2 changed files with 68 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/strbuf.c
+45
View File
@@ -681,6 +681,30 @@ int main(void) {
VERIFY(ffStrbufMatchSeparatedS(&strbuf, ":abcdef", ':') == false);
}
{
// ffStrbufMatchSeparatedNS with explicit compLength: the length-bounded
// contract is load-bearing for the Linux keyboard handler, which passes
// a fixed-size buffer length rather than a NUL-terminated string.
ffStrbufSetStatic(&strbuf, "abc");
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 11, "abc:def:ghi", ':') == true);
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 3, "abc:def:ghi", ':') == true);
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 7, "abc:def:ghi", ':') == true); // "abc:def"
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 4, "abc:def:ghi", ':') == true); // "abc:"
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 5, "abc:def:ghi", ':') == true); // "abc:d" truncated, but "abc" is a complete segment
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 3, "abd:def:ghi", ':') == false);
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 0, "abc:def:ghi", ':') == false);
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 0, "", ':') == false);
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 11, "abc:def:ghi", ' ') == false); // no separator in bounds
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 12, "abc:def:ghi\0j", ':') == true); // embedded NUL inside bounds
ffStrbufClear(&strbuf);
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 11, "abc:def:ghi", ':') == false); // no empty segment
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 8, "abc::def", ':') == true); // empty segment in the middle
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 4, "abc:", ':') == true); // trailing empty segment
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 4, ":abc", ':') == true); // leading empty segment
VERIFY(ffStrbufMatchSeparatedNS(&strbuf, 0, "abc", ':') == true); // empty separated string itself
}
{
ffStrbufSetStatic(&strbuf, "ABC");
VERIFY(ffStrbufMatchSeparatedIgnCaseS(&strbuf, "abc:def:ghi", ' ') == false);
@@ -721,6 +745,27 @@ int main(void) {
VERIFY(ffStrbufSeparatedContainIgnCaseS(&strbuf, "i", ':') == false);
}
{
// ffStrbufSeparatedContainNS with empty strings: an empty list contains
// only the empty segment (symmetric to ffStrbufMatchSeparatedNS); an
// empty comp matches only an empty segment in the list.
ffStrbufClear(&strbuf);
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "", ':') == true); // empty list contains the empty segment
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 3, "abc", ':') == false); // empty list contains no non-empty segment
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "abc", ':') == true); // compLength == 0 means an empty segment
ffStrbufSetStatic(&strbuf, "abc::def");
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "", ':') == true); // empty segment in the middle
ffStrbufSetStatic(&strbuf, "abc:");
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "", ':') == true); // trailing empty segment
ffStrbufSetStatic(&strbuf, ":abc");
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "", ':') == true); // leading empty segment
ffStrbufSetStatic(&strbuf, "abc:def");
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "", ':') == false); // no empty segment
ffStrbufSetStatic(&strbuf, "abc");
VERIFY(ffStrbufSeparatedContainNS(&strbuf, 0, "", ':') == false); // no empty segment
}
{
ffStrbufSetStatic(&strbuf, "abc");
ffStrbufSubstr(&strbuf, 0, 1); // start, end