AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-27 05:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
b39741b45f
glibc/stdlib/tst-strtol-binary-main.c

152 lines
5.0 KiB
C
Raw Normal View History

C2x strtol binary constant handling 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.
2023-02-16 23:02:40 +00:00
/* Test strtol functions with C2X binary integers.
Copyright (C) 2022-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 <inttypes.h>
#include <limits.h>
#include <locale.h>
#include <stdio.h>
#include <stdlib.h>
#include <wchar.h>
#include <support/check.h>
#if TEST_LOCALE
# include <support/support.h>
#endif
#define CONCAT_(X, Y) X ## Y
#define CONCAT(X, Y) CONCAT_ (X, Y)
#define FNX(FN) CONCAT (FNPFX, FN)
#define CHECK_RES(ARG, RES, EP, EXPECTED) \
do \
{ \
if (TEST_C2X) \
{ \
TEST_COMPARE ((RES), EXPECTED); \
TEST_COMPARE (*(EP), 0); \
} \
else \
{ \
TEST_COMPARE ((RES), 0); \
TEST_VERIFY ((EP) == ((ARG)[0] == L_('-') \
? (ARG) + 2 \
: (ARG) + 1)); \
} \
} \
while (0)
static void
one_check (const CHAR *s, long int expected_l, unsigned long int expected_ul,
long long int expected_ll, unsigned long long int expected_ull)
{
CHAR *ep;
long int ret_l;
unsigned long int ret_ul;
long long int ret_ll;
unsigned long long int ret_ull;
ret_l = FNX (l) (s, &ep, 0);
CHECK_RES (s, ret_l, ep, expected_l);
ret_l = FNX (l) (s, &ep, 2);
CHECK_RES (s, ret_l, ep, expected_l);
ret_ul = FNX (ul) (s, &ep, 0);
CHECK_RES (s, ret_ul, ep, expected_ul);
ret_ul = FNX (ul) (s, &ep, 2);
CHECK_RES (s, ret_ul, ep, expected_ul);
ret_ll = FNX (ll) (s, &ep, 0);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ll = FNX (ll) (s, &ep, 2);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ull = FNX (ull) (s, &ep, 0);
CHECK_RES (s, ret_ull, ep, expected_ull);
ret_ull = FNX (ull) (s, &ep, 2);
CHECK_RES (s, ret_ull, ep, expected_ull);
ret_ll = FNX (imax) (s, &ep, 0);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ll = FNX (imax) (s, &ep, 2);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ull = FNX (umax) (s, &ep, 0);
CHECK_RES (s, ret_ull, ep, expected_ull);
ret_ull = FNX (umax) (s, &ep, 2);
CHECK_RES (s, ret_ull, ep, expected_ull);
#if TEST_Q
ret_ll = FNX (q) (s, &ep, 0);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ll = FNX (q) (s, &ep, 2);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ull = FNX (uq) (s, &ep, 0);
CHECK_RES (s, ret_ull, ep, expected_ull);
ret_ull = FNX (uq) (s, &ep, 2);
CHECK_RES (s, ret_ull, ep, expected_ull);
#endif
#if TEST_LOCALE
locale_t loc = xnewlocale (LC_NUMERIC_MASK, "C", (locale_t) 0);
ret_l = FNX (l_l) (s, &ep, 0, loc);
CHECK_RES (s, ret_l, ep, expected_l);
ret_l = FNX (l_l) (s, &ep, 2, loc);
CHECK_RES (s, ret_l, ep, expected_l);
ret_ul = FNX (ul_l) (s, &ep, 0, loc);
CHECK_RES (s, ret_ul, ep, expected_ul);
ret_ul = FNX (ul_l) (s, &ep, 2, loc);
CHECK_RES (s, ret_ul, ep, expected_ul);
ret_ll = FNX (ll_l) (s, &ep, 0, loc);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ll = FNX (ll_l) (s, &ep, 2, loc);
CHECK_RES (s, ret_ll, ep, expected_ll);
ret_ull = FNX (ull_l) (s, &ep, 0, loc);
CHECK_RES (s, ret_ull, ep, expected_ull);
ret_ull = FNX (ull_l) (s, &ep, 2, loc);
CHECK_RES (s, ret_ull, ep, expected_ull);
#endif
}
static int
do_test (void)
{
one_check (L_("0b101"), 5, 5, 5, 5);
one_check (L_("0B101"), 5, 5, 5, 5);
one_check (L_("-0b11111"), -31, -31, -31, -31);
one_check (L_("-0B11111"), -31, -31, -31, -31);
one_check (L_("0b111111111111111111111111111111111"),
LONG_MAX >= 0x1ffffffffLL ? (long int) 0x1ffffffffLL : LONG_MAX,
(ULONG_MAX >= 0x1ffffffffULL
? (unsigned long int) 0x1ffffffffULL
: ULONG_MAX),
0x1ffffffffLL, 0x1ffffffffULL);
one_check (L_("0B111111111111111111111111111111111"),
LONG_MAX >= 0x1ffffffffLL ? (long int) 0x1ffffffffLL : LONG_MAX,
(ULONG_MAX >= 0x1ffffffffULL
? (unsigned long int) 0x1ffffffffULL
: ULONG_MAX),
0x1ffffffffLL, 0x1ffffffffULL);
one_check (L_("-0b111111111111111111111111111111111"),
LONG_MIN <= -0x1ffffffffLL ? (long int) -0x1ffffffffLL : LONG_MIN,
(ULONG_MAX >= 0x1ffffffffULL
? (unsigned long int) -0x1ffffffffULL
: ULONG_MAX),
-0x1ffffffffLL, -0x1ffffffffULL);
one_check (L_("-0B111111111111111111111111111111111"),
LONG_MIN <= -0x1ffffffffLL ? (long int) -0x1ffffffffLL : LONG_MIN,
(ULONG_MAX >= 0x1ffffffffULL
? (unsigned long int) -0x1ffffffffULL
: ULONG_MAX),
-0x1ffffffffLL, -0x1ffffffffULL);
return 0;
}
#include <support/test-driver.c>
Reference in New Issue Copy Permalink