mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-08-08 10:50:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement S conversion specifier for printf-related functions

Browse source 
POSIX specifies that a conversion specifier of S must be interpreted
the same way as %ls. This patch implements this.
This commit is contained in:
Gabriel Ravier 2023-03-23 17:16:19 +01:00
parent 58b2f9bd6b
commit edabba4fbb
2 changed files with 9 additions and 0 deletions
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";
goto FormatString;
}
case 'S':
// Specified by POSIX to be equivalent to %ls
signbit = 63;
goto FormatStringPNotFetchedYet;
case 'q':
flags |= FLAGS_QUOTE;
// fallthrough
case 's':
FormatStringPNotFetchedYet:
p = va_arg(va, void *);
FormatString:
if (__fmt_stoa(out, arg, p, flags, prec, width, signbit, qchar) == -1) {

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

@ -64,6 +64,10 @@ TEST(fmt, d) {
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) {
EXPECT_STREQ("1", _gc(xasprintf("%g", 1.)));
EXPECT_STREQ(" 1", _gc(xasprintf("% g", 1.)));