From a4059d3e60d33c3bda2674af03ff5787db3a4264 Mon Sep 17 00:00:00 2001 From: Kevin Ballard Date: Sun, 21 Sep 2014 23:19:57 -0700 Subject: [PATCH] Support wide characters in printf %c --- builtin_printf.cpp | 1 + tests/printf.in | 1 + tests/printf.out | 1 + 3 files changed, 3 insertions(+) diff --git a/builtin_printf.cpp b/builtin_printf.cpp index 1a1ab3350..f77a3a721 100644 --- a/builtin_printf.cpp +++ b/builtin_printf.cpp @@ -467,6 +467,7 @@ void builtin_printf_state_t::print_direc(const wchar_t *start, size_t length, wc fmt.append(L"L"); break; case L's': + case L'c': fmt.append(L"l"); break; default: diff --git a/tests/printf.in b/tests/printf.in index 1e42b9827..402dafb7b 100644 --- a/tests/printf.in +++ b/tests/printf.in @@ -4,6 +4,7 @@ printf "%x %X %o %llu\n" 10 11 8 -1 printf "%a %A\n" 14 15 printf "%c %s\n" a hello +printf "%c%c%c\n" hello … o printf "%e %E\n" 5 6 printf "%20d\n" 50 diff --git a/tests/printf.out b/tests/printf.out index 20a7109b3..8ec41404f 100644 --- a/tests/printf.out +++ b/tests/printf.out @@ -2,6 +2,7 @@ Hello 1 2 3.000000 4.000000 5 6 a B 10 18446744073709551615 0xep+0 0XFP+0 a hello +h…o 5.000000e+00 6.000000E+00 50 5 10