63ce7108c4
This imports the gnulib strstr and strerror modules. It doesn't make any other changes to gdb; I found it simpler to work with the branch if I made the changes more indepdendent than I had previously. 2013-11-18 Tom Tromey <tromey@redhat.com> * gnulib/update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add strerror and strstr. * gnulib/aclocal.m4: Update. * gnulib/config.in: Update. * gnulib/configure: Update. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/errno.in.h: New. * gnulib/import/intprops.h: New. * gnulib/import/m4/errno_h.m4: New. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/strerror.m4: New. * gnulib/import/m4/strstr.m4: New. * gnulib/import/m4/sys_socket_h.m4: New. * gnulib/import/strerror-override.c: New. * gnulib/import/strerror-override.h: New. * gnulib/import/strerror.c: New. * gnulib/import/strstr.c: New.
82 lines
3 KiB
C
82 lines
3 KiB
C
/* Copyright (C) 1991-1994, 1996-1998, 2000, 2004, 2007-2012 Free Software
|
|
Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3, or (at your option)
|
|
any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License along
|
|
with this program; if not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
/* This particular implementation was written by Eric Blake, 2008. */
|
|
|
|
#ifndef _LIBC
|
|
# include <config.h>
|
|
#endif
|
|
|
|
/* Specification of strstr. */
|
|
#include <string.h>
|
|
|
|
#include <stdbool.h>
|
|
|
|
#ifndef _LIBC
|
|
# define __builtin_expect(expr, val) (expr)
|
|
#endif
|
|
|
|
#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)))
|
|
#include "str-two-way.h"
|
|
|
|
/* Return the first occurrence of NEEDLE in HAYSTACK. Return HAYSTACK
|
|
if NEEDLE is empty, otherwise NULL if NEEDLE is not found in
|
|
HAYSTACK. */
|
|
char *
|
|
strstr (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 &= *haystack++ == *needle++;
|
|
if (*needle)
|
|
return NULL;
|
|
if (ok)
|
|
return (char *) haystack_start;
|
|
|
|
/* Reduce the size of haystack using strchr, since it has a smaller
|
|
linear coefficient than the Two-Way algorithm. */
|
|
needle_len = needle - needle_start;
|
|
haystack = strchr (haystack_start + 1, *needle_start);
|
|
if (!haystack || __builtin_expect (needle_len == 1, 0))
|
|
return (char *) haystack;
|
|
needle -= needle_len;
|
|
haystack_len = (haystack > haystack_start + needle_len ? 1
|
|
: needle_len + haystack_start - haystack);
|
|
|
|
/* 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, needle_len);
|
|
return two_way_long_needle ((const unsigned char *) haystack, haystack_len,
|
|
(const unsigned char *) needle, needle_len);
|
|
}
|
|
|
|
#undef LONG_NEEDLE_THRESHOLD
|