added errno checks + formatting

Author: uzairnawaz

libc/src/__support/wchar/wcrtomb.cpp

@@ -26,21 +26,21 @@ ErrorOr<size_t> wcrtomb(char *__restrict s, wchar_t wc, mbstate *__restrict ps,
   static_assert(sizeof(wchar_t) == 4);
 
   CharacterConverter cr(ps);
-  
+
   if (!cr.isValidState())
     return Error(EINVAL);
-  
+
   char buf[sizeof(wchar_t) / sizeof(char)];
   if (s == nullptr)
     s = buf;
-  
+
   // if cr isnt empty, it should be represented in mbstate already
   if (cr.isEmpty()) {
     int status = cr.push(static_cast<char32_t>(wc));
     if (status != 0)
       return Error(EILSEQ);
   }
-  
+
   size_t count = 0;
   while (!cr.isEmpty() && count < max_written) {
     auto utf8 = cr.pop_utf8(); // can never fail as long as the push succeeded

libc/src/__support/wchar/wcrtomb.h

@@ -18,7 +18,8 @@
 namespace LIBC_NAMESPACE_DECL {
 namespace internal {
 
-ErrorOr<size_t> wcrtomb(char *__restrict s, wchar_t wc, mbstate *__restrict ps, size_t max_written);
+ErrorOr<size_t> wcrtomb(char *__restrict s, wchar_t wc, mbstate *__restrict ps,
+                        size_t max_written);
 
 } // namespace internal
 } // namespace LIBC_NAMESPACE_DECL

libc/src/__support/wchar/wcsrtombs.cpp

@@ -22,9 +22,6 @@ namespace internal {
 
 ErrorOr<size_t> wcsrtombs(char *__restrict dst, const wchar_t **__restrict src,
                           size_t len, mbstate *__restrict ps) {
-  if (src == nullptr)
-    return Error(-1);
-
   // ignore len parameter when theres no destination string
   if (dst == nullptr)
     len = SIZE_MAX;

libc/src/wchar/wctomb.cpp

@@ -22,7 +22,7 @@ LLVM_LIBC_FUNCTION(int, wctomb, (char *s, wchar_t wc)) {
   if (s == nullptr)
     return 0;
 
-  auto result = internal::wcrtomb(s, wc, &internal_mbstate, sizeof (wchar_t));
+  auto result = internal::wcrtomb(s, wc, &internal_mbstate, sizeof(wchar_t));
 
   if (!result.has_value()) { // invalid wide character
     libc_errno = EILSEQ;

libc/test/src/wchar/CMakeLists.txt

@@ -89,6 +89,7 @@ add_libc_test(
     libc.src.string.memset
     libc.hdr.types.wchar_t
     libc.hdr.types.mbstate_t
+    libc.src.__support.wchar.mbstate
     libc.src.__support.libc_errno
 )
 

libc/test/src/wchar/wcsrtombs_test.cpp

@@ -22,6 +22,7 @@ TEST_F(LlvmLibcWCSRToMBSTest, SingleCharacterOneByte) {
   const wchar_t *wcs = L"U";
   char mbs[] = {0, 0};
   size_t cnt = LIBC_NAMESPACE::wcsrtombs(mbs, &wcs, 2, &state);
+  ASSERT_ERRNO_SUCCESS();
   ASSERT_EQ(cnt, static_cast<size_t>(1));
   ASSERT_EQ(mbs[0], 'U');
   ASSERT_EQ(mbs[1], '\0');
@@ -42,13 +43,15 @@ TEST_F(LlvmLibcWCSRToMBSTest, MultipleCompleteConversions) {
   char expected[6] = {'\xC3', '\xBF', '\xEA', '\xB0', '\x95', '\x00'};
 
   size_t cnt1 = LIBC_NAMESPACE::wcsrtombs(mbs, &wcs, 2, &state);
+  ASSERT_ERRNO_SUCCESS();
   ASSERT_EQ(cnt1, static_cast<size_t>(2));
   ASSERT_EQ(wcs, wcs_start + 1);
   ASSERT_EQ(mbs[0], expected[0]);
   ASSERT_EQ(mbs[1], expected[1]);
   ASSERT_EQ(mbs[2], '\x01'); // not modified
 
   size_t cnt2 = LIBC_NAMESPACE::wcsrtombs(mbs + cnt1, &wcs, 3, &state);
+  ASSERT_ERRNO_SUCCESS();
   ASSERT_EQ(cnt2, static_cast<size_t>(3));
   ASSERT_EQ(wcs, wcs_start + 2);
   ASSERT_EQ(mbs[0], expected[0]);
@@ -60,6 +63,7 @@ TEST_F(LlvmLibcWCSRToMBSTest, MultipleCompleteConversions) {
 
   // all that is left in the string is the null terminator
   size_t cnt3 = LIBC_NAMESPACE::wcsrtombs(mbs + cnt1 + cnt2, &wcs, 50, &state);
+  ASSERT_ERRNO_SUCCESS();
   ASSERT_EQ(cnt3, static_cast<size_t>(0));
   ASSERT_EQ(wcs, nullptr);
   ASSERT_EQ(mbs[0], expected[0]);
@@ -87,13 +91,15 @@ TEST_F(LlvmLibcWCSRToMBSTest, MultiplePartialConversions) {
   size_t count = 0;
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs, &wcs, 1, &state);
+  ASSERT_ERRNO_SUCCESS();
   written += count;
   // ASSERT_EQ(count, static_cast<size_t>(1));
   ASSERT_EQ(wcs, wcs_start);
   ASSERT_EQ(mbs[0], expected[0]);
   ASSERT_EQ(mbs[1], '\x01');
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs + written, &wcs, 2, &state);
+  ASSERT_ERRNO_SUCCESS();
   written += count;
   ASSERT_EQ(count, static_cast<size_t>(2));
   ASSERT_EQ(wcs, wcs_start + 1);
@@ -103,6 +109,7 @@ TEST_F(LlvmLibcWCSRToMBSTest, MultiplePartialConversions) {
   ASSERT_EQ(mbs[3], '\x01');
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs + written, &wcs, 3, &state);
+  ASSERT_ERRNO_SUCCESS();
   written += count;
   ASSERT_EQ(count, static_cast<size_t>(2));
   ASSERT_EQ(wcs, nullptr);
@@ -126,6 +133,7 @@ TEST_F(LlvmLibcWCSRToMBSTest, NullDestination) {
   // null destination means the conversion isnt stored, but all the side effects
   // still occur. the len parameter is also ignored
   size_t count = LIBC_NAMESPACE::wcsrtombs(nullptr, &wcs, 3, &state);
+  ASSERT_ERRNO_SUCCESS();
   ASSERT_EQ(count, static_cast<size_t>(7));
   ASSERT_EQ(wcs, nullptr);
 }
@@ -144,13 +152,15 @@ TEST_F(LlvmLibcWCSRToMBSTest, NullState) {
   size_t count = 0;
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs, &wcs, 1, nullptr);
+  ASSERT_ERRNO_SUCCESS();
   written += count;
   ASSERT_EQ(count, static_cast<size_t>(1));
   ASSERT_EQ(wcs, wcs_start);
   ASSERT_EQ(mbs[0], expected[0]);
   ASSERT_EQ(mbs[1], '\x01');
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs + written, &wcs, 2, nullptr);
+  ASSERT_ERRNO_SUCCESS();
   written += count;
   ASSERT_EQ(count, static_cast<size_t>(2));
   ASSERT_EQ(wcs, wcs_start + 1);
@@ -160,6 +170,7 @@ TEST_F(LlvmLibcWCSRToMBSTest, NullState) {
   ASSERT_EQ(mbs[3], '\x01');
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs + written, &wcs, 3, nullptr);
+  ASSERT_ERRNO_SUCCESS();
   written += count;
   ASSERT_EQ(count, static_cast<size_t>(2));
   ASSERT_EQ(wcs, nullptr);
@@ -180,9 +191,9 @@ TEST_F(LlvmLibcWCSRToMBSTest, InvalidWchar) {
   char mbs[15];
   // convert the valid wchar
   size_t count = LIBC_NAMESPACE::wcsrtombs(mbs, &wcs, 5, &state);
+  ASSERT_ERRNO_SUCCESS();
   ASSERT_EQ(count, static_cast<size_t>(5));
   ASSERT_TRUE(*wcs == static_cast<wchar_t>(0x12ffff));
-  ASSERT_ERRNO_SUCCESS();
 
   count = LIBC_NAMESPACE::wcsrtombs(mbs + count, &wcs, 5, &state); // invalid
   ASSERT_EQ(count, static_cast<size_t>(-1));
@@ -204,10 +215,7 @@ TEST_F(LlvmLibcWCSRToMBSTest, InvalidState) {
 TEST_F(LlvmLibcWCSRToMBSTest, NullSrc) {
   // Passing in a nullptr should crash the program.
   char mbs[] = {0, 0};
-  EXPECT_DEATH(
-      [&mbs] {
-        LIBC_NAMESPACE::wcsrtombs(mbs, nullptr, 2, nullptr);
-      },
-      WITH_SIGNAL(-1));
+  EXPECT_DEATH([&mbs] { LIBC_NAMESPACE::wcsrtombs(mbs, nullptr, 2, nullptr); },
+               WITH_SIGNAL(-1));
 }
 #endif // LIBC_HAS_ADDRESS_SANITIZER