[libc-commits] [libc] [libc] Support ls in printf (PR #178841)

[Michael Jones via libc-commits]

================
@@ -24,21 +33,63 @@ template <WriteMode write_mode>
 LIBC_INLINE int convert_string(Writer<write_mode> *writer,
                                const FormatSection &to_conv) {
   size_t string_len = 0;
-  const char *str_ptr = reinterpret_cast<const char *>(to_conv.conv_val_ptr);
+
+  if (to_conv.length_modifier == LengthModifier::l) {
+#ifndef LIBC_COPT_PRINTF_DISABLE_WIDE
+    const wchar_t *wstr_ptr =
+        reinterpret_cast<const wchar_t *>(to_conv.conv_val_ptr);
+
+#ifndef LIBC_COPT_PRINTF_NO_NULLPTR_CHECKS
+    if (wstr_ptr == nullptr) {
+      wstr_ptr = L"(null)";
+    }
+#endif // LIBC_COPT_PRINTF_NO_NULLPTR_CHECKS
+
+    char buffer[MB_LEN_MAX];
+    internal::mbstate mbstate;
+    size_t written = 0;
+    for (const wchar_t *cur_str = (wstr_ptr); cur_str[string_len];
+         ++string_len) {
+      wchar_t wc = cur_str[string_len];
+
+      auto ret = internal::wcrtomb(buffer, wc, &mbstate);
+      if (!ret.has_value()) {
+        return MB_CONVERSION_ERROR;
+      }
+      written += ret.value();
+
+      if (to_conv.precision >= 0 &&
+          static_cast<size_t>(to_conv.precision) < written) {
+        written -= ret.value();
+        break;
+      }
+    }
+    string_len = written;
+#else
+
+    const char *str_ptr = reinterpret_cast<const char *>(to_conv.conv_val_ptr);
 
 #ifndef LIBC_COPT_PRINTF_NO_NULLPTR_CHECKS
   if (str_ptr == nullptr) {
     str_ptr = "(null)";
   }
 #endif // LIBC_COPT_PRINTF_NO_NULLPTR_CHECKS
 
-  for (const char *cur_str = (str_ptr); cur_str[string_len]; ++string_len) {
-    ;
-  }
+  string_len = cpp::min(internal::string_length(str_ptr),
+                        static_cast<size_t>(to_conv.precision));
----------------
michaelrj-google wrote:

This is not the same as what was replaced since a negative precision should be treated as no precision specified. If you define a `precision` variable at the top of the function you can reuse that here.

https://github.com/llvm/llvm-project/pull/178841