mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-22 21:10:07 +00:00
64924422a9
C2x adds binary integer constants starting with 0b or 0B, and supports those constants in strtol-family functions when the base passed is 0 or 2. Implement that strtol support for glibc. As discussed at <https://sourceware.org/pipermail/libc-alpha/2020-December/120414.html>, this is incompatible with previous C standard versions, in that such an input string starting with 0b or 0B was previously required to be parsed as 0 (with the rest of the string unprocessed). Thus, as proposed there, this patch adds 20 new __isoc23_* functions with appropriate header redirection support. This patch does *not* do anything about scanf %i (which will need 12 new functions per long double variant, so 12, 24 or 36 depending on the glibc configuration), instead leaving that for a future patch. The function names would remain as __isoc23_* even if C2x ends up published in 2024 rather than 2023. Making this change leads to the question of what should happen to internal uses of these functions in glibc and its tests. The header redirection (which applies for _GNU_SOURCE or any other feature test macros enabling C2x features) has the effect of redirecting internal uses but without those uses then ending up at a hidden alias (see the comment in include/stdio.h about interaction with libc_hidden_proto). It seems desirable for the default for internal uses to be the same versions used by normal code using _GNU_SOURCE, so rather than doing anything to disable that redirection, similar macro definitions to those in include/stdio.h are added to the include/ headers for the new functions. Given that the default for uses in glibc is for the redirections to apply, the next question is whether the C2x semantics are correct for all those uses. Uses with the base fixed to 10, 16 or any other value other than 0 or 2 can be ignored. I think this leaves the following internal uses to consider (an important consideration for review of this patch will be both whether this list is complete and whether my conclusions on all entries in it are correct): benchtests/bench-malloc-simple.c benchtests/bench-string.h elf/sotruss-lib.c math/libm-test-support.c nptl/perf.c nscd/nscd_conf.c nss/nss_files/files-parse.c posix/tst-fnmatch.c posix/wordexp.c resolv/inet_addr.c rt/tst-mqueue7.c soft-fp/testit.c stdlib/fmtmsg.c support/support_test_main.c support/test-container.c sysdeps/pthread/tst-mutex10.c I think all of these places are OK with the new semantics, except for resolv/inet_addr.c, where the POSIX semantics of inet_addr do not allow for binary constants; thus, I changed that file (to use __strtoul_internal, whose semantics are unchanged) and added a test for this case. In the case of posix/wordexp.c I think accepting binary constants is OK since POSIX explicitly allows additional forms of shell arithmetic expressions, and in stdlib/fmtmsg.c SEV_LEVEL is not in POSIX so again I think accepting binary constants is OK. Functions such as __strtol_internal, which are only exported for compatibility with old binaries from when those were used in inline functions in headers, have unchanged semantics; the __*_l_internal versions (purely internal to libc and not exported) have a new argument to specify whether to accept binary constants. As well as for the standard functions, the header redirection also applies to the *_l versions (GNU extensions), and to legacy functions such as strtoq, to avoid confusing inconsistency (the *q functions redirect to __isoc23_*ll rather than needing their own __isoc23_* entry points). For the functions that are only declared with _GNU_SOURCE, this means the old versions are no longer available for normal user programs at all. An internal __GLIBC_USE_C2X_STRTOL macro is used to control the redirections in the headers, and cases in glibc that wish to avoid the redirections - the function implementations themselves and the tests of the old versions of the GNU functions - then undefine and redefine that macro to allow the old versions to be accessed. (There would of course be greater complexity should we wish to make any of the old versions into compat symbols / avoid them being defined at all for new glibc ABIs.) strtol_l.c has some similarity to strtol.c in gnulib, but has already diverged some way (and isn't listed at all at https://sourceware.org/glibc/wiki/SharedSourceFiles unlike strtoll.c and strtoul.c); I haven't made any attempts at gnulib compatibility in the changes to that file. I note incidentally that inttypes.h and wchar.h are missing the __nonnull present on declarations of this family of functions in stdlib.h; I didn't make any changes in that regard for the new declarations added.
357 lines
9.6 KiB
C
357 lines
9.6 KiB
C
/* Copyright (C) 1997-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/>. */
|
|
|
|
/*
|
|
* ISO C99: 7.8 Format conversion of integer types <inttypes.h>
|
|
*/
|
|
|
|
#ifndef _INTTYPES_H
|
|
#define _INTTYPES_H 1
|
|
|
|
#include <features.h>
|
|
/* Get the type definitions. */
|
|
#include <stdint.h>
|
|
|
|
/* Get a definition for wchar_t. But we must not define wchar_t itself. */
|
|
#ifndef ____gwchar_t_defined
|
|
# ifdef __cplusplus
|
|
# define __gwchar_t wchar_t
|
|
# elif defined __WCHAR_TYPE__
|
|
typedef __WCHAR_TYPE__ __gwchar_t;
|
|
# else
|
|
# define __need_wchar_t
|
|
# include <stddef.h>
|
|
typedef wchar_t __gwchar_t;
|
|
# endif
|
|
# define ____gwchar_t_defined 1
|
|
#endif
|
|
|
|
# if __WORDSIZE == 64
|
|
# define __PRI64_PREFIX "l"
|
|
# define __PRIPTR_PREFIX "l"
|
|
# else
|
|
# define __PRI64_PREFIX "ll"
|
|
# define __PRIPTR_PREFIX
|
|
# endif
|
|
|
|
/* Macros for printing format specifiers. */
|
|
|
|
/* Decimal notation. */
|
|
# define PRId8 "d"
|
|
# define PRId16 "d"
|
|
# define PRId32 "d"
|
|
# define PRId64 __PRI64_PREFIX "d"
|
|
|
|
# define PRIdLEAST8 "d"
|
|
# define PRIdLEAST16 "d"
|
|
# define PRIdLEAST32 "d"
|
|
# define PRIdLEAST64 __PRI64_PREFIX "d"
|
|
|
|
# define PRIdFAST8 "d"
|
|
# define PRIdFAST16 __PRIPTR_PREFIX "d"
|
|
# define PRIdFAST32 __PRIPTR_PREFIX "d"
|
|
# define PRIdFAST64 __PRI64_PREFIX "d"
|
|
|
|
|
|
# define PRIi8 "i"
|
|
# define PRIi16 "i"
|
|
# define PRIi32 "i"
|
|
# define PRIi64 __PRI64_PREFIX "i"
|
|
|
|
# define PRIiLEAST8 "i"
|
|
# define PRIiLEAST16 "i"
|
|
# define PRIiLEAST32 "i"
|
|
# define PRIiLEAST64 __PRI64_PREFIX "i"
|
|
|
|
# define PRIiFAST8 "i"
|
|
# define PRIiFAST16 __PRIPTR_PREFIX "i"
|
|
# define PRIiFAST32 __PRIPTR_PREFIX "i"
|
|
# define PRIiFAST64 __PRI64_PREFIX "i"
|
|
|
|
/* Octal notation. */
|
|
# define PRIo8 "o"
|
|
# define PRIo16 "o"
|
|
# define PRIo32 "o"
|
|
# define PRIo64 __PRI64_PREFIX "o"
|
|
|
|
# define PRIoLEAST8 "o"
|
|
# define PRIoLEAST16 "o"
|
|
# define PRIoLEAST32 "o"
|
|
# define PRIoLEAST64 __PRI64_PREFIX "o"
|
|
|
|
# define PRIoFAST8 "o"
|
|
# define PRIoFAST16 __PRIPTR_PREFIX "o"
|
|
# define PRIoFAST32 __PRIPTR_PREFIX "o"
|
|
# define PRIoFAST64 __PRI64_PREFIX "o"
|
|
|
|
/* Unsigned integers. */
|
|
# define PRIu8 "u"
|
|
# define PRIu16 "u"
|
|
# define PRIu32 "u"
|
|
# define PRIu64 __PRI64_PREFIX "u"
|
|
|
|
# define PRIuLEAST8 "u"
|
|
# define PRIuLEAST16 "u"
|
|
# define PRIuLEAST32 "u"
|
|
# define PRIuLEAST64 __PRI64_PREFIX "u"
|
|
|
|
# define PRIuFAST8 "u"
|
|
# define PRIuFAST16 __PRIPTR_PREFIX "u"
|
|
# define PRIuFAST32 __PRIPTR_PREFIX "u"
|
|
# define PRIuFAST64 __PRI64_PREFIX "u"
|
|
|
|
/* lowercase hexadecimal notation. */
|
|
# define PRIx8 "x"
|
|
# define PRIx16 "x"
|
|
# define PRIx32 "x"
|
|
# define PRIx64 __PRI64_PREFIX "x"
|
|
|
|
# define PRIxLEAST8 "x"
|
|
# define PRIxLEAST16 "x"
|
|
# define PRIxLEAST32 "x"
|
|
# define PRIxLEAST64 __PRI64_PREFIX "x"
|
|
|
|
# define PRIxFAST8 "x"
|
|
# define PRIxFAST16 __PRIPTR_PREFIX "x"
|
|
# define PRIxFAST32 __PRIPTR_PREFIX "x"
|
|
# define PRIxFAST64 __PRI64_PREFIX "x"
|
|
|
|
/* UPPERCASE hexadecimal notation. */
|
|
# define PRIX8 "X"
|
|
# define PRIX16 "X"
|
|
# define PRIX32 "X"
|
|
# define PRIX64 __PRI64_PREFIX "X"
|
|
|
|
# define PRIXLEAST8 "X"
|
|
# define PRIXLEAST16 "X"
|
|
# define PRIXLEAST32 "X"
|
|
# define PRIXLEAST64 __PRI64_PREFIX "X"
|
|
|
|
# define PRIXFAST8 "X"
|
|
# define PRIXFAST16 __PRIPTR_PREFIX "X"
|
|
# define PRIXFAST32 __PRIPTR_PREFIX "X"
|
|
# define PRIXFAST64 __PRI64_PREFIX "X"
|
|
|
|
|
|
/* Macros for printing `intmax_t' and `uintmax_t'. */
|
|
# define PRIdMAX __PRI64_PREFIX "d"
|
|
# define PRIiMAX __PRI64_PREFIX "i"
|
|
# define PRIoMAX __PRI64_PREFIX "o"
|
|
# define PRIuMAX __PRI64_PREFIX "u"
|
|
# define PRIxMAX __PRI64_PREFIX "x"
|
|
# define PRIXMAX __PRI64_PREFIX "X"
|
|
|
|
|
|
/* Macros for printing `intptr_t' and `uintptr_t'. */
|
|
# define PRIdPTR __PRIPTR_PREFIX "d"
|
|
# define PRIiPTR __PRIPTR_PREFIX "i"
|
|
# define PRIoPTR __PRIPTR_PREFIX "o"
|
|
# define PRIuPTR __PRIPTR_PREFIX "u"
|
|
# define PRIxPTR __PRIPTR_PREFIX "x"
|
|
# define PRIXPTR __PRIPTR_PREFIX "X"
|
|
|
|
|
|
/* Macros for scanning format specifiers. */
|
|
|
|
/* Signed decimal notation. */
|
|
# define SCNd8 "hhd"
|
|
# define SCNd16 "hd"
|
|
# define SCNd32 "d"
|
|
# define SCNd64 __PRI64_PREFIX "d"
|
|
|
|
# define SCNdLEAST8 "hhd"
|
|
# define SCNdLEAST16 "hd"
|
|
# define SCNdLEAST32 "d"
|
|
# define SCNdLEAST64 __PRI64_PREFIX "d"
|
|
|
|
# define SCNdFAST8 "hhd"
|
|
# define SCNdFAST16 __PRIPTR_PREFIX "d"
|
|
# define SCNdFAST32 __PRIPTR_PREFIX "d"
|
|
# define SCNdFAST64 __PRI64_PREFIX "d"
|
|
|
|
/* Signed decimal notation. */
|
|
# define SCNi8 "hhi"
|
|
# define SCNi16 "hi"
|
|
# define SCNi32 "i"
|
|
# define SCNi64 __PRI64_PREFIX "i"
|
|
|
|
# define SCNiLEAST8 "hhi"
|
|
# define SCNiLEAST16 "hi"
|
|
# define SCNiLEAST32 "i"
|
|
# define SCNiLEAST64 __PRI64_PREFIX "i"
|
|
|
|
# define SCNiFAST8 "hhi"
|
|
# define SCNiFAST16 __PRIPTR_PREFIX "i"
|
|
# define SCNiFAST32 __PRIPTR_PREFIX "i"
|
|
# define SCNiFAST64 __PRI64_PREFIX "i"
|
|
|
|
/* Unsigned decimal notation. */
|
|
# define SCNu8 "hhu"
|
|
# define SCNu16 "hu"
|
|
# define SCNu32 "u"
|
|
# define SCNu64 __PRI64_PREFIX "u"
|
|
|
|
# define SCNuLEAST8 "hhu"
|
|
# define SCNuLEAST16 "hu"
|
|
# define SCNuLEAST32 "u"
|
|
# define SCNuLEAST64 __PRI64_PREFIX "u"
|
|
|
|
# define SCNuFAST8 "hhu"
|
|
# define SCNuFAST16 __PRIPTR_PREFIX "u"
|
|
# define SCNuFAST32 __PRIPTR_PREFIX "u"
|
|
# define SCNuFAST64 __PRI64_PREFIX "u"
|
|
|
|
/* Octal notation. */
|
|
# define SCNo8 "hho"
|
|
# define SCNo16 "ho"
|
|
# define SCNo32 "o"
|
|
# define SCNo64 __PRI64_PREFIX "o"
|
|
|
|
# define SCNoLEAST8 "hho"
|
|
# define SCNoLEAST16 "ho"
|
|
# define SCNoLEAST32 "o"
|
|
# define SCNoLEAST64 __PRI64_PREFIX "o"
|
|
|
|
# define SCNoFAST8 "hho"
|
|
# define SCNoFAST16 __PRIPTR_PREFIX "o"
|
|
# define SCNoFAST32 __PRIPTR_PREFIX "o"
|
|
# define SCNoFAST64 __PRI64_PREFIX "o"
|
|
|
|
/* Hexadecimal notation. */
|
|
# define SCNx8 "hhx"
|
|
# define SCNx16 "hx"
|
|
# define SCNx32 "x"
|
|
# define SCNx64 __PRI64_PREFIX "x"
|
|
|
|
# define SCNxLEAST8 "hhx"
|
|
# define SCNxLEAST16 "hx"
|
|
# define SCNxLEAST32 "x"
|
|
# define SCNxLEAST64 __PRI64_PREFIX "x"
|
|
|
|
# define SCNxFAST8 "hhx"
|
|
# define SCNxFAST16 __PRIPTR_PREFIX "x"
|
|
# define SCNxFAST32 __PRIPTR_PREFIX "x"
|
|
# define SCNxFAST64 __PRI64_PREFIX "x"
|
|
|
|
|
|
/* Macros for scanning `intmax_t' and `uintmax_t'. */
|
|
# define SCNdMAX __PRI64_PREFIX "d"
|
|
# define SCNiMAX __PRI64_PREFIX "i"
|
|
# define SCNoMAX __PRI64_PREFIX "o"
|
|
# define SCNuMAX __PRI64_PREFIX "u"
|
|
# define SCNxMAX __PRI64_PREFIX "x"
|
|
|
|
/* Macros for scaning `intptr_t' and `uintptr_t'. */
|
|
# define SCNdPTR __PRIPTR_PREFIX "d"
|
|
# define SCNiPTR __PRIPTR_PREFIX "i"
|
|
# define SCNoPTR __PRIPTR_PREFIX "o"
|
|
# define SCNuPTR __PRIPTR_PREFIX "u"
|
|
# define SCNxPTR __PRIPTR_PREFIX "x"
|
|
|
|
|
|
__BEGIN_DECLS
|
|
|
|
#if __WORDSIZE == 64
|
|
|
|
/* We have to define the `uintmax_t' type using `ldiv_t'. */
|
|
typedef struct
|
|
{
|
|
long int quot; /* Quotient. */
|
|
long int rem; /* Remainder. */
|
|
} imaxdiv_t;
|
|
|
|
#else
|
|
|
|
/* We have to define the `uintmax_t' type using `lldiv_t'. */
|
|
typedef struct
|
|
{
|
|
__extension__ long long int quot; /* Quotient. */
|
|
__extension__ long long int rem; /* Remainder. */
|
|
} imaxdiv_t;
|
|
|
|
#endif
|
|
|
|
|
|
/* Compute absolute value of N. */
|
|
extern intmax_t imaxabs (intmax_t __n) __THROW __attribute__ ((__const__));
|
|
|
|
/* Return the `imaxdiv_t' representation of the value of NUMER over DENOM. */
|
|
extern imaxdiv_t imaxdiv (intmax_t __numer, intmax_t __denom)
|
|
__THROW __attribute__ ((__const__));
|
|
|
|
/* Like `strtol' but convert to `intmax_t'. */
|
|
extern intmax_t strtoimax (const char *__restrict __nptr,
|
|
char **__restrict __endptr, int __base) __THROW;
|
|
|
|
/* Like `strtoul' but convert to `uintmax_t'. */
|
|
extern uintmax_t strtoumax (const char *__restrict __nptr,
|
|
char ** __restrict __endptr, int __base) __THROW;
|
|
|
|
/* Like `wcstol' but convert to `intmax_t'. */
|
|
extern intmax_t wcstoimax (const __gwchar_t *__restrict __nptr,
|
|
__gwchar_t **__restrict __endptr, int __base)
|
|
__THROW;
|
|
|
|
/* Like `wcstoul' but convert to `uintmax_t'. */
|
|
extern uintmax_t wcstoumax (const __gwchar_t *__restrict __nptr,
|
|
__gwchar_t ** __restrict __endptr, int __base)
|
|
__THROW;
|
|
|
|
/* Versions of the above functions that handle '0b' and '0B' prefixes
|
|
in base 0 or 2. */
|
|
#if __GLIBC_USE (C2X_STRTOL)
|
|
# ifdef __REDIRECT
|
|
extern intmax_t __REDIRECT_NTH (strtoimax, (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base), __isoc23_strtoimax);
|
|
extern uintmax_t __REDIRECT_NTH (strtoumax, (const char *__restrict __nptr,
|
|
char **__restrict __endptr,
|
|
int __base), __isoc23_strtoumax);
|
|
extern intmax_t __REDIRECT_NTH (wcstoimax,
|
|
(const __gwchar_t *__restrict __nptr,
|
|
__gwchar_t **__restrict __endptr, int __base),
|
|
__isoc23_wcstoimax);
|
|
extern uintmax_t __REDIRECT_NTH (wcstoumax,
|
|
(const __gwchar_t *__restrict __nptr,
|
|
__gwchar_t **__restrict __endptr, int __base),
|
|
__isoc23_wcstoumax);
|
|
# else
|
|
extern intmax_t __isoc23_strtoimax (const char *__restrict __nptr,
|
|
char **__restrict __endptr, int __base)
|
|
__THROW;
|
|
extern uintmax_t __isoc23_strtoumax (const char *__restrict __nptr,
|
|
char ** __restrict __endptr, int __base)
|
|
__THROW;
|
|
extern intmax_t __isoc23_wcstoimax (const __gwchar_t *__restrict __nptr,
|
|
__gwchar_t **__restrict __endptr,
|
|
int __base)
|
|
__THROW;
|
|
extern uintmax_t __isoc23_wcstoumax (const __gwchar_t *__restrict __nptr,
|
|
__gwchar_t ** __restrict __endptr,
|
|
int __base)
|
|
__THROW;
|
|
# define strtoimax __isoc23_strtoimax
|
|
# define strtoumax __isoc23_strtoumax
|
|
# define wcstoimax __isoc23_wcstoimax
|
|
# define wcstoumax __isoc23_wcstoumax
|
|
# endif
|
|
#endif
|
|
|
|
__END_DECLS
|
|
|
|
#endif /* inttypes.h */
|