diff options
author | Joseph Myers <joseph@codesourcery.com> | 2023-03-02 19:10:37 +0000 |
---|---|---|
committer | Joseph Myers <joseph@codesourcery.com> | 2023-03-02 19:10:37 +0000 |
commit | dee2bea048b688b643a9a3b44b26ca9f7a706fe8 (patch) | |
tree | 3e7cd1057154850968d13023bc2e082cfc7940ad /sysdeps/ieee754/ldbl-128ibm-compat/ieee128-isoc23_swscanf.c | |
parent | 51aeab9a363a0d000d0912aa3d6490463a26fba2 (diff) | |
download | glibc-dee2bea048b688b643a9a3b44b26ca9f7a706fe8.tar.gz glibc-dee2bea048b688b643a9a3b44b26ca9f7a706fe8.tar.xz glibc-dee2bea048b688b643a9a3b44b26ca9f7a706fe8.zip |
C2x scanf binary constant handling
C2x adds binary integer constants starting with 0b or 0B, and supports those constants for the %i scanf format (in addition to the %b format, which isn't yet implemented for scanf in glibc). Implement that scanf support for glibc. As with the strtol support, 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 input potentially matching subsequent parts of the scanf format string). Thus this patch adds 12 new __isoc23_* functions per long double format (12, 24 or 36 depending on how many long double formats the glibc configuration supports), with appropriate header redirection support (generally very closely following that for the __isoc99_* scanf functions - note that __GLIBC_USE (DEPRECATED_SCANF) takes precedence over __GLIBC_USE (C2X_STRTOL), so the case of GNU extensions to C89 continues to get old-style GNU %a and does not get this new feature). The function names would remain as __isoc23_* even if C2x ends up published in 2024 rather than 2023. When scanf %b support is added, I think it will be appropriate for all versions of scanf to follow C2x rules for inputs to the %b format (given that there are no compatibility concerns for a new format). Tested for x86_64 (full glibc testsuite). The first version was also tested for powerpc (32-bit) and powerpc64le (stdio-common/ and wcsmbs/ tests), and with build-many-glibcs.py.
Diffstat (limited to 'sysdeps/ieee754/ldbl-128ibm-compat/ieee128-isoc23_swscanf.c')
-rw-r--r-- | sysdeps/ieee754/ldbl-128ibm-compat/ieee128-isoc23_swscanf.c | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-isoc23_swscanf.c b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-isoc23_swscanf.c new file mode 100644 index 0000000000..b50a2bfbca --- /dev/null +++ b/sysdeps/ieee754/ldbl-128ibm-compat/ieee128-isoc23_swscanf.c @@ -0,0 +1,41 @@ +/* Wrapper for __isoc23_swscanf. IEEE128 version. + Copyright (C) 2019-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 <stdarg.h> +#include <strfile.h> +#include <libioP.h> + +extern int +___ieee128_isoc23_swscanf (const wchar_t *string, const wchar_t *format, ...) +{ + va_list ap; + int done; + int mode_flags = + SCANF_ISOC99_A | SCANF_ISOC23_BIN_CST | SCANF_LDBL_USES_FLOAT128; + + _IO_strfile sf; + struct _IO_wide_data wd; + FILE *fp = _IO_strfile_readw (&sf, &wd, string); + + va_start (ap, format); + done = __vfwscanf_internal (fp, format, ap, mode_flags); + va_end (ap); + + return done; +} +strong_alias (___ieee128_isoc23_swscanf, __isoc23_swscanfieee128) |