mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-03-03 15:38:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix issue #771 by implementing S conversion specifier for printf-related functions (#786)

Browse source 
* Implement S conversion specifier for printf-related functions

POSIX specifies that a conversion specifier of S must be interpreted
the same way as %ls. This patch implements this.

* clang-format

---------

Co-authored-by: Gavin Hayes <gavin@computoid.com>
This commit is contained in:
Gabriel Ravier 2023-03-25 19:38:21 +01:00 • committed by GitHub
parent 58b2f9bd6b
commit 2d6ea2fbc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libc/fmt/fmt.c
View file

@ -359,10 +359,15 @@ _Hide int __fmt(void *fn, void *arg, const char *format, va_list va) {
p = "\r\e[K"; p = "\r\e[K";
goto FormatString; goto FormatString;
} }
case 'S':
// Specified by POSIX to be equivalent to %ls
signbit = 63;
goto FormatStringPNotFetchedYet;
case 'q': case 'q':
flags |= FLAGS_QUOTE; flags |= FLAGS_QUOTE;
// fallthrough // fallthrough
case 's': case 's':
FormatStringPNotFetchedYet:
p = va_arg(va, void *); p = va_arg(va, void *);
FormatString: FormatString:
if (__fmt_stoa(out, arg, p, flags, prec, width, signbit, qchar) == -1) { if (__fmt_stoa(out, arg, p, flags, prec, width, signbit, qchar) == -1) {

5
test/libc/fmt/fmt_test.c
View file

@ -64,6 +64,11 @@ TEST(fmt, d) {
EXPECT_STREQ("-2147483648", _gc(xasprintf("% d", INT_MIN))); EXPECT_STREQ("-2147483648", _gc(xasprintf("% d", INT_MIN)));
} }
TEST(fmt, s) {
EXPECT_STREQ("Wide character output test",
_gc(xasprintf("%S", L"Wide character output test")));
}
TEST(fmt, g) { TEST(fmt, g) {
EXPECT_STREQ("1", _gc(xasprintf("%g", 1.))); EXPECT_STREQ("1", _gc(xasprintf("%g", 1.)));
EXPECT_STREQ(" 1", _gc(xasprintf("% g", 1.))); EXPECT_STREQ(" 1", _gc(xasprintf("% g", 1.)));