mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-14 01:00:07 +00:00
5f83b2674e
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.
105 lines
3.1 KiB
C
105 lines
3.1 KiB
C
/* Copyright (C) 1991-2023 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <stdio.h>
|
|
#include <printf.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <wchar.h>
|
|
#include <sys/param.h>
|
|
#include <printf.h>
|
|
|
|
#include "../locale/localeinfo.h"
|
|
|
|
#ifndef COMPILE_WPRINTF
|
|
# define CHAR_T char
|
|
# define UCHAR_T unsigned char
|
|
# define INT_T int
|
|
# define L_(Str) Str
|
|
# define ISDIGIT(Ch) isdigit (Ch)
|
|
# define ISASCII(Ch) isascii (Ch)
|
|
# define MBRLEN(Cp, L, St) __mbrlen (Cp, L, St)
|
|
|
|
# define PUT(F, S, N) _IO_sputn (F, S, N)
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
done += _IO_padn (s, Padchar, width)
|
|
#else
|
|
# define vfprintf vfwprintf
|
|
# define CHAR_T wchar_t
|
|
# define UCHAR_T uwchar_t
|
|
# define INT_T wint_t
|
|
# define L_(Str) L##Str
|
|
# define ISDIGIT(Ch) iswdigit (Ch)
|
|
|
|
# define PUT(F, S, N) _IO_sputn (F, S, N)
|
|
# define PAD(Padchar) \
|
|
if (width > 0) \
|
|
done += _IO_wpadn (s, Padchar, width)
|
|
#endif
|
|
|
|
#define DONT_NEED_READ_INT
|
|
#include "printf-parse.h"
|
|
|
|
|
|
size_t
|
|
parse_printf_format (const char *fmt, size_t n, int *argtypes)
|
|
{
|
|
size_t nargs; /* Number of arguments. */
|
|
size_t max_ref_arg; /* Highest index used in a positional arg. */
|
|
struct printf_spec spec;
|
|
const unsigned char *f = (const unsigned char *) fmt;
|
|
bool failed;
|
|
|
|
nargs = 0;
|
|
max_ref_arg = 0;
|
|
|
|
/* Search for format specifications. */
|
|
for (f = __find_specmb (f); *f != '\0'; f = spec.next_fmt)
|
|
{
|
|
/* Parse this spec. */
|
|
nargs += __parse_one_specmb (f, nargs, &spec, &max_ref_arg, &failed);
|
|
|
|
/* If the width is determined by an argument, it is an int. */
|
|
if (spec.width_arg != -1 && (size_t) spec.width_arg < n)
|
|
argtypes[spec.width_arg] = PA_INT;
|
|
|
|
/* If the precision is determined by an argument, it is an int. */
|
|
if (spec.prec_arg != -1 && (size_t) spec.prec_arg < n)
|
|
argtypes[spec.prec_arg] = PA_INT;
|
|
|
|
if ((size_t) spec.data_arg < n)
|
|
switch (spec.ndata_args)
|
|
{
|
|
case 0: /* No arguments. */
|
|
break;
|
|
case 1: /* One argument; we already have the type. */
|
|
argtypes[spec.data_arg] = spec.data_arg_type;
|
|
break;
|
|
default:
|
|
/* We have more than one argument for this format spec. We must
|
|
call the arginfo function again to determine all the types. */
|
|
(void) (*__printf_arginfo_table[spec.info.spec])
|
|
(&spec.info, n - spec.data_arg, &argtypes[spec.data_arg],
|
|
&spec.size);
|
|
break;
|
|
}
|
|
}
|
|
|
|
return MAX (nargs, max_ref_arg);
|
|
}
|