Skip to content

[libc] wcslcat implementation #146588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 9, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions libc/src/wchar/wcslcat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ namespace LIBC_NAMESPACE_DECL {
LLVM_LIBC_FUNCTION(size_t, wcslcat,
(wchar_t *__restrict dst, const wchar_t *__restrict src,
size_t dstsize)) {
size_t dstlen = internal::string_length(dst);
size_t srclen = internal::string_length(src);
size_t limit = dstsize - dstlen - 1;

const size_t dstlen = internal::string_length(dst);
const size_t srclen = internal::string_length(src);
int limit = static_cast<int>(dstsize - dstlen - 1);
size_t returnval = (dstsize < dstlen ? dstsize : dstlen) + srclen;
if (static_cast<int>(limit) < 0)
return (dstsize < dstlen ? dstsize : dstlen) + srclen;
size_t i = 0;
return returnval;
int i = 0;
for (; i < limit && src[i] != L'\0'; ++i) {
dst[dstlen + i] = src[i];
}

// appending null terminator if there is room
if (dstlen + i < dstlen + dstsize)
dst[dstlen + i] = L'\0';
return (dstsize < dstlen ? dstsize : dstlen) + srclen;
return returnval;
}

} // namespace LIBC_NAMESPACE_DECL
15 changes: 0 additions & 15 deletions libc/test/src/wchar/wcslcat_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,3 @@ TEST(LlvmLibcWCSLCatTest, SmallerNoOverwriteAfter0) {
ASSERT_TRUE(dst[7] == L'\0');
ASSERT_EQ(res, size_t(4));
}

TEST(LlvmLibcWCSLCatTest, No0) {
const wchar_t *src = L"cd";
wchar_t dst[7]{L"ab"};
size_t res = LIBC_NAMESPACE::wcslcat(dst, src, 1);
ASSERT_TRUE(dst[0] == L'a');
ASSERT_TRUE(dst[1] == L'b');
ASSERT_TRUE(dst[2] == L'\0');
ASSERT_EQ(res, size_t(3));
res = LIBC_NAMESPACE::wcslcat(dst, src, 2);
ASSERT_TRUE(dst[0] == L'a');
ASSERT_TRUE(dst[1] == L'b');
ASSERT_TRUE(dst[2] == L'\0');
ASSERT_EQ(res, size_t(4));
}
Loading