mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-30 21:23:52 +08:00
5e4e10636c
These are a grab bag of changes where the testsuite was using internal symbols of some variety, but this was straightforward to fix, and the fixed code should work with or without the change to compile the testsuite under _ISOMAC. Four of these are just more #include adjustments, but I want to highlight sysdeps/powerpc/fpu/tst-setcontext-fpscr.c, which appears to have been written before the advent of sys/auxv.h. I think a big chunk of this file could be replaced by a simple call to getauxval, but I'll let someone who actually has a powerpc machine to test on do that. dlfcn/tst-dladdr.c was including ldsodefs.h just so it could use DL_LOOKUP_ADDRESS to print an additional diagnostic; as requested by Carlos, I have removed this. math/test-misc.c was using #ifndef NO_LONG_DOUBLE, which is an internal configuration macro, to decide whether to do certain tests involving 'long double'. I changed the test to #if LDBL_MANT_DIG > DBL_MANT_DIG instead, which uses only public float.h macros and is equivalent on all supported platforms. (Note that NO_LONG_DOUBLE doesn't mean 'the compiler doesn't support long double', it means 'long double is the same as double'.) tst-writev.c has a configuration macro 'ARTIFICIAL_LIMIT' that the Makefiles are expected to define, and sysdeps/unix/sysv/linux/Makefile was using the internal __getpagesize in the definition; changed to sysconf(_SC_PAGESIZE) which is the POSIX equivalent. ia64-linux doesn't supply 'clone', only '__clone2', which is not defined in the public headers(!) All the other clone tests have local extern declarations of __clone2, but tst-clone.c doesn't; it was getting away with this because include/sched.h does declare __clone2. * nss/tst-cancel-getpwuid_r.c: Include nss.h. * string/strcasestr.c: No need to include config.h. * sysdeps/powerpc/fpu/tst-setcontext-fpscr.c: Include sys/auxv.h. Don't include sysdep.h. * sysdeps/powerpc/tst-set_ppr.c: Don't include dl-procinfo.h. * dlfcn/tst-dladdr.c: Don't include ldsodefs.h. Don't use DL_LOOKUP_ADDRESS. * math/test-misc.c: Instead of testing NO_LONG_DOUBLE, test whether LDBL_MANT_DIG is greater than DBL_MANT_DIG. * sysdeps/unix/sysv/linux/Makefile (CFLAGS-tst-writev.c): Use sysconf (_SC_PAGESIZE) instead of __getpagesize in definition of ARTIFICIAL_LIMIT. * sysdeps/unix/sysv/linux/tst-clone.c [__ia64__]: Add extern declaration of __clone2.
105 lines
3.4 KiB
C
105 lines
3.4 KiB
C
/* Return the offset of one string within another.
|
|
Copyright (C) 1994-2017 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/*
|
|
* My personal strstr() implementation that beats most other algorithms.
|
|
* Until someone tells me otherwise, I assume that this is the
|
|
* fastest implementation of strstr() in C.
|
|
* I deliberately chose not to comment it. You should have at least
|
|
* as much fun trying to understand it, as I had to write it :-).
|
|
*
|
|
* Stephen R. van den Berg, berg@pool.informatik.rwth-aachen.de */
|
|
|
|
/* Specification. */
|
|
#include <string.h>
|
|
|
|
#include <ctype.h>
|
|
#include <stdbool.h>
|
|
#include <strings.h>
|
|
|
|
#define TOLOWER(Ch) tolower (Ch)
|
|
|
|
/* Two-Way algorithm. */
|
|
#define RETURN_TYPE char *
|
|
#define AVAILABLE(h, h_l, j, n_l) \
|
|
(!memchr ((h) + (h_l), '\0', (j) + (n_l) - (h_l)) \
|
|
&& ((h_l) = (j) + (n_l)))
|
|
#define CHECK_EOL (1)
|
|
#define RET0_IF_0(a) if (!a) goto ret0
|
|
#define CANON_ELEMENT(c) TOLOWER (c)
|
|
#define CMP_FUNC(p1, p2, l) \
|
|
__strncasecmp ((const char *) (p1), (const char *) (p2), l)
|
|
#include "str-two-way.h"
|
|
|
|
#undef strcasestr
|
|
#undef __strcasestr
|
|
|
|
#ifndef STRCASESTR
|
|
#define STRCASESTR __strcasestr
|
|
#endif
|
|
|
|
|
|
/* Find the first occurrence of NEEDLE in HAYSTACK, using
|
|
case-insensitive comparison. This function gives unspecified
|
|
results in multibyte locales. */
|
|
char *
|
|
STRCASESTR (const char *haystack_start, const char *needle_start)
|
|
{
|
|
const char *haystack = haystack_start;
|
|
const char *needle = needle_start;
|
|
size_t needle_len; /* Length of NEEDLE. */
|
|
size_t haystack_len; /* Known minimum length of HAYSTACK. */
|
|
bool ok = true; /* True if NEEDLE is prefix of HAYSTACK. */
|
|
|
|
/* Determine length of NEEDLE, and in the process, make sure
|
|
HAYSTACK is at least as long (no point processing all of a long
|
|
NEEDLE if HAYSTACK is too short). */
|
|
while (*haystack && *needle)
|
|
{
|
|
ok &= (TOLOWER ((unsigned char) *haystack)
|
|
== TOLOWER ((unsigned char) *needle));
|
|
haystack++;
|
|
needle++;
|
|
}
|
|
if (*needle)
|
|
return NULL;
|
|
if (ok)
|
|
return (char *) haystack_start;
|
|
needle_len = needle - needle_start;
|
|
haystack = haystack_start + 1;
|
|
haystack_len = needle_len - 1;
|
|
|
|
/* Perform the search. Abstract memory is considered to be an array
|
|
of 'unsigned char' values, not an array of 'char' values. See
|
|
ISO C 99 section 6.2.6.1. */
|
|
if (needle_len < LONG_NEEDLE_THRESHOLD)
|
|
return two_way_short_needle ((const unsigned char *) haystack,
|
|
haystack_len,
|
|
(const unsigned char *) needle_start,
|
|
needle_len);
|
|
return two_way_long_needle ((const unsigned char *) haystack, haystack_len,
|
|
(const unsigned char *) needle_start,
|
|
needle_len);
|
|
}
|
|
|
|
#undef LONG_NEEDLE_THRESHOLD
|
|
|
|
#ifndef NO_ALIAS
|
|
weak_alias (__strcasestr, strcasestr)
|
|
#endif
|