lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

C2x printf %wN, %wfN support (bug 24466)

Browse Source 
ISO C2x defines printf length modifiers wN (for intN_t / int_leastN_t
/ uintN_t / uint_leastN_t) and wfN (for int_fastN_t / uint_fastN_t).
Add support for those length modifiers (such a feature was previously
requested in bug 24466).  scanf support is to be added separately.
GCC 13 has format checking support for these modifiers.

When used with the support for registering format specifiers, these
modifiers are translated to existing flags in struct printf_info,
rather than trying to add some way of distinguishing them without
breaking the printf_info ABI.  C2x requires an error to be returned
for unsupported values of N; this is implemented for printf-family
functions, but the parse_printf_format interface doesn't support error
returns, so such an error gets discarded by that function.

Tested for x86_64 and x86.
This commit is contained in:
Joseph Myers
2023-06-19 18:52:12 +00:00
parent 8022fc7d51
commit 5f83b2674e
11 changed files with 851 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
stdio-common/printf-parsemb.c
View File

@ -56,14 +56,17 @@ size_t
attribute_hidden
#ifdef COMPILE_WPRINTF
__parse_one_specwc (const UCHAR_T *format, size_t posn,
struct printf_spec *spec, size_t *max_ref_arg)
struct printf_spec *spec, size_t *max_ref_arg,
bool *failed)
#else
__parse_one_specmb (const UCHAR_T *format, size_t posn,
struct printf_spec *spec, size_t *max_ref_arg)
struct printf_spec *spec, size_t *max_ref_arg,
bool *failed)
#endif
{
unsigned int n;
size_t nargs = 0;
bool is_fast;
/* Skip the '%'. */
++format;
@ -81,6 +84,8 @@ __parse_one_specmb (const UCHAR_T *format, size_t posn,
spec->info.wide = sizeof (UCHAR_T) > 1;
spec->info.is_binary128 = 0;
*failed = false;
/* Test for positional argument. */
if (ISDIGIT (*format))
{
@ -298,6 +303,53 @@ __parse_one_specmb (const UCHAR_T *format, size_t posn,
#endif
spec->info.is_long = sizeof (uintmax_t) > sizeof (unsigned int);
break;
case L_('w'):
is_fast = false;
if (*format == L_('f'))
{
++format;
is_fast = true;
}
int bitwidth = 0;
if (ISDIGIT (*format))
bitwidth = read_int (&format);
if (is_fast)
switch (bitwidth)
{
case 8:
bitwidth = INT_FAST8_WIDTH;
break;
case 16:
bitwidth = INT_FAST16_WIDTH;
break;
case 32:
bitwidth = INT_FAST32_WIDTH;
break;
case 64:
bitwidth = INT_FAST64_WIDTH;
break;
}
switch (bitwidth)
{
case 8:
spec->info.is_char = 1;
break;
case 16:
spec->info.is_short = 1;
break;
case 32:
break;
case 64:
spec->info.is_long_double = 1;
spec->info.is_long = 1;
break;
default:
/* ISO C requires this error to be detected. */
__set_errno (EINVAL);
*failed = true;
break;
}
break;
default:
/* Not a recognized modifier. Backup. */
--format;