mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
c4f50205e1
This patch fixes various places where a space should have been present before '(' in accordance with the GNU Coding Standards. Most but not all of the fixes in this patch are for calls to sizeof (but it's not exhaustive regarding such calls that should be fixed). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-strcpy.c (do_test): Use space before '('. * benchtests/bench-string.h (cmdline_process_function): Likewise. * benchtests/bench-strlen.c (do_test): Likewise. (test_main): Likewise. * catgets/gencat.c (read_old): Likewise. * elf/cache.c (load_aux_cache): Likewise. * iconvdata/bug-iconv8.c (do_test): Likewise. * math/test-tgmath-ret.c (do_test): Likewise. * nis/nis_call.c (rec_dirsearch): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nptl/tst-audit-threads.c (do_test): Likewise. * nptl/tst-cancel4-common.h (set_socket_buffer): Likewise. * nss/nss_test1.c (init): Likewise. * nss/test-netdb.c (test_hosts): Likewise. * posix/execvpe.c (maybe_script_execute): Likewise. * stdio-common/tst-fmemopen4.c (do_test): Likewise. * stdio-common/tst-printf.c (do_test): Likewise. * stdio-common/vfscanf-internal.c (__vfscanf_internal): Likewise. * stdlib/fmtmsg.c (NKEYWORDS): Likewise. * stdlib/qsort.c (STACK_SIZE): Likewise. * stdlib/test-canon.c (do_test): Likewise. * stdlib/tst-swapcontext1.c (do_test): Likewise. * string/memcmp.c (OPSIZ): Likewise. * string/test-strcpy.c (do_test): Likewise. (do_random_tests): Likewise. * string/test-strlen.c (do_test): Likewise. (test_main): Likewise. * string/test-strrchr.c (do_test): Likewise. (do_random_tests): Likewise. * string/tester.c (test_memrchr): Likewise. (test_memchr): Likewise. * sysdeps/generic/memcopy.h (OPSIZ): Likewise. * sysdeps/generic/unwind-dw2.c (execute_stack_op): Likewise. * sysdeps/generic/unwind-pe.h (read_sleb128): Likewise. (read_encoded_value_with_base): Likewise. * sysdeps/hppa/dl-machine.h (elf_machine_runtime_setup): Likewise. * sysdeps/hppa/fpu/feupdateenv.c (__feupdateenv): Likewise. * sysdeps/ia64/fpu/sfp-machine.h (TI_BITS): Likewise. * sysdeps/mach/hurd/spawni.c (__spawni): Likewise. * sysdeps/posix/spawni.c (maybe_script_execute): Likewise. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c (query_auxv): Likewise. * sysdeps/unix/sysv/linux/aarch64/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/arm/ioperm.c (init_iosys): Likewise. * sysdeps/unix/sysv/linux/csky/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/m68k/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/nios2/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/spawni.c (maybe_script_execute): Likewise. * sysdeps/unix/sysv/linux/x86/bits/procfs.h (ELF_NGREG): Likewise. * sysdeps/unix/sysv/linux/x86/bits/sigcontext.h (FP_XSTATE_MAGIC2_SIZE): Likewise. * sysdeps/x86/fpu/sfp-machine.h (TI_BITS): Likewise. * time/test_time.c (main): Likewise.
246 lines
6.0 KiB
C
246 lines
6.0 KiB
C
/* Test and measure strcpy functions.
|
|
Copyright (C) 1999-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Jakub Jelinek <jakub@redhat.com>, 1999.
|
|
Added wcscpy support by Liubov Dmitrieva <liubov.dmitrieva@gmail.com>, 2011
|
|
|
|
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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifdef WIDE
|
|
# include <wchar.h>
|
|
# define CHAR wchar_t
|
|
# define UCHAR wchar_t
|
|
# define sfmt "ls"
|
|
# define BIG_CHAR WCHAR_MAX
|
|
# define SMALL_CHAR 1273
|
|
# define STRCMP wcscmp
|
|
# define MEMCMP wmemcmp
|
|
# define MEMSET wmemset
|
|
#else
|
|
# define CHAR char
|
|
# define UCHAR unsigned char
|
|
# define sfmt "s"
|
|
# define BIG_CHAR CHAR_MAX
|
|
# define SMALL_CHAR 127
|
|
# define STRCMP strcmp
|
|
# define MEMCMP memcmp
|
|
# define MEMSET memset
|
|
#endif
|
|
|
|
#ifndef STRCPY_RESULT
|
|
# define STRCPY_RESULT(dst, len) dst
|
|
# define TEST_MAIN
|
|
# ifndef WIDE
|
|
# define TEST_NAME "strcpy"
|
|
# else
|
|
# define TEST_NAME "wcscpy"
|
|
# endif
|
|
# include "test-string.h"
|
|
# ifndef WIDE
|
|
# define SIMPLE_STRCPY simple_strcpy
|
|
# define STRCPY strcpy
|
|
# else
|
|
# define SIMPLE_STRCPY simple_wcscpy
|
|
# define STRCPY wcscpy
|
|
# endif
|
|
|
|
CHAR *SIMPLE_STRCPY (CHAR *, const CHAR *);
|
|
|
|
IMPL (SIMPLE_STRCPY, 0)
|
|
IMPL (STRCPY, 1)
|
|
|
|
CHAR *
|
|
SIMPLE_STRCPY (CHAR *dst, const CHAR *src)
|
|
{
|
|
CHAR *ret = dst;
|
|
while ((*dst++ = *src++) != '\0');
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
typedef CHAR *(*proto_t) (CHAR *, const CHAR *);
|
|
|
|
static void
|
|
do_one_test (impl_t *impl, CHAR *dst, const CHAR *src,
|
|
size_t len __attribute__((unused)))
|
|
{
|
|
if (CALL (impl, dst, src) != STRCPY_RESULT (dst, len))
|
|
{
|
|
error (0, 0, "Wrong result in function %s %p %p", impl->name,
|
|
CALL (impl, dst, src), STRCPY_RESULT (dst, len));
|
|
ret = 1;
|
|
return;
|
|
}
|
|
|
|
if (STRCMP (dst, src) != 0)
|
|
{
|
|
error (0, 0,
|
|
"Wrong result in function %s dst \"%" sfmt "\" src \"%" sfmt "\"",
|
|
impl->name, dst, src);
|
|
ret = 1;
|
|
return;
|
|
}
|
|
}
|
|
|
|
static void
|
|
do_test (size_t align1, size_t align2, size_t len, int max_char)
|
|
{
|
|
size_t i;
|
|
CHAR *s1, *s2;
|
|
/* For wcscpy: align1 and align2 here mean alignment not in bytes,
|
|
but in wchar_ts, in bytes it will equal to align * (sizeof (wchar_t))
|
|
len for wcschr here isn't in bytes but it's number of wchar_t symbols. */
|
|
align1 &= 7;
|
|
if ((align1 + len) * sizeof (CHAR) >= page_size)
|
|
return;
|
|
|
|
align2 &= 7;
|
|
if ((align2 + len) * sizeof (CHAR) >= page_size)
|
|
return;
|
|
|
|
s1 = (CHAR *) (buf1) + align1;
|
|
s2 = (CHAR *) (buf2) + align2;
|
|
|
|
for (i = 0; i < len; i++)
|
|
s1[i] = 32 + 23 * i % (max_char - 32);
|
|
s1[len] = 0;
|
|
|
|
FOR_EACH_IMPL (impl, 0)
|
|
do_one_test (impl, s2, s1, len);
|
|
}
|
|
|
|
static void
|
|
do_random_tests (void)
|
|
{
|
|
size_t i, j, n, align1, align2, len;
|
|
UCHAR *p1 = (UCHAR *) (buf1 + page_size) - 512;
|
|
UCHAR *p2 = (UCHAR *) (buf2 + page_size) - 512;
|
|
UCHAR *res;
|
|
|
|
for (n = 0; n < ITERATIONS; n++)
|
|
{
|
|
/* For wcsrchr: align1 and align2 here mean align not in bytes,
|
|
but in wchar_ts, in bytes it will equal to align * (sizeof
|
|
(wchar_t)). For strrchr we need to check all alignments from
|
|
0 to 63 since some assembly implementations have separate
|
|
prolog for alignments more 48. */
|
|
|
|
align1 = random () & (63 / sizeof (CHAR));
|
|
if (random () & 1)
|
|
align2 = random () & (63 / sizeof (CHAR));
|
|
else
|
|
align2 = align1 + (random () & 24);
|
|
len = random () & 511;
|
|
j = align1;
|
|
if (align2 > j)
|
|
j = align2;
|
|
if (len + j >= 511)
|
|
len = 510 - j - (random () & 7);
|
|
j = len + align1 + 64;
|
|
if (j > 512)
|
|
j = 512;
|
|
for (i = 0; i < j; i++)
|
|
{
|
|
if (i == len + align1)
|
|
p1[i] = 0;
|
|
else
|
|
{
|
|
p1[i] = random () & BIG_CHAR;
|
|
if (i >= align1 && i < len + align1 && !p1[i])
|
|
p1[i] = (random () & SMALL_CHAR) + 3;
|
|
}
|
|
}
|
|
|
|
FOR_EACH_IMPL (impl, 1)
|
|
{
|
|
MEMSET (p2 - 64, '\1', 512 + 64);
|
|
res = (UCHAR *) CALL (impl, (CHAR *) (p2 + align2), (CHAR *) (p1 + align1));
|
|
if (res != STRCPY_RESULT (p2 + align2, len))
|
|
{
|
|
error (0, 0, "Iteration %zd - wrong result in function %s (%zd, %zd, %zd) %p != %p",
|
|
n, impl->name, align1, align2, len, res,
|
|
STRCPY_RESULT (p2 + align2, len));
|
|
ret = 1;
|
|
}
|
|
for (j = 0; j < align2 + 64; ++j)
|
|
{
|
|
if (p2[j - 64] != '\1')
|
|
{
|
|
error (0, 0, "Iteration %zd - garbage before, %s (%zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len);
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
for (j = align2 + len + 1; j < 512; ++j)
|
|
{
|
|
if (p2[j] != '\1')
|
|
{
|
|
error (0, 0, "Iteration %zd - garbage after, %s (%zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len);
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
if (MEMCMP (p1 + align1, p2 + align2, len + 1))
|
|
{
|
|
error (0, 0, "Iteration %zd - different strings, %s (%zd, %zd, %zd)",
|
|
n, impl->name, align1, align2, len);
|
|
ret = 1;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
int
|
|
test_main (void)
|
|
{
|
|
size_t i;
|
|
|
|
test_init ();
|
|
|
|
printf ("%23s", "");
|
|
FOR_EACH_IMPL (impl, 0)
|
|
printf ("\t%s", impl->name);
|
|
putchar ('\n');
|
|
|
|
for (i = 0; i < 16; ++i)
|
|
{
|
|
do_test (0, 0, i, SMALL_CHAR);
|
|
do_test (0, 0, i, BIG_CHAR);
|
|
do_test (0, i, i, SMALL_CHAR);
|
|
do_test (i, 0, i, BIG_CHAR);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (0, 0, 8 << i, SMALL_CHAR);
|
|
do_test (8 - i, 2 * i, 8 << i, SMALL_CHAR);
|
|
}
|
|
|
|
for (i = 1; i < 8; ++i)
|
|
{
|
|
do_test (i, 2 * i, 8 << i, SMALL_CHAR);
|
|
do_test (2 * i, i, 8 << i, BIG_CHAR);
|
|
do_test (i, i, 8 << i, SMALL_CHAR);
|
|
do_test (i, i, 8 << i, BIG_CHAR);
|
|
}
|
|
|
|
do_random_tests ();
|
|
return ret;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|