diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | lib/memmem.c | 49 | ||||
| -rw-r--r-- | lib/os_internal.h | 9 |
3 files changed, 59 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index f4863ce40..76e7fde6f 100644 --- a/configure.ac +++ b/configure.ac @@ -860,7 +860,7 @@ AC_CHECK_FUNCS([strncasecmp _strnicmp], [have_required_function="yes"]) AC_FUNC_FSEEKO -AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strndup strpbrk strsep strtok_r timegm unsetenv]) +AC_REPLACE_FUNCS([asprintf basename gettimeofday setenv strndup strpbrk strsep strtok_r timegm unsetenv memmem]) AC_LIBSOURCE([hstrerror.c]) AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <netdb.h>]], [[hstrerror(0)]])], diff --git a/lib/memmem.c b/lib/memmem.c new file mode 100644 index 000000000..1cbe629bd --- /dev/null +++ b/lib/memmem.c @@ -0,0 +1,49 @@ +/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004,2007 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 2, 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, write to the Free Software Foundation, + Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#include "config.h" + +#include <stddef.h> +#include <string.h> + +/* Return the first occurrence of NEEDLE in HAYSTACK. */ +void *xine_internal_memmem (const void *haystack, size_t haystack_len, + const void *needle, size_t needle_len) +{ + const char *begin; + const char *const last_possible + = (const char *) haystack + haystack_len - needle_len; + + if (needle_len == 0) + /* The first occurrence of the empty string is deemed to occur at + the beginning of the string. */ + return (void *) haystack; + + /* Sanity check, otherwise the loop might search through the whole + memory. */ + if (haystack_len < needle_len) + return NULL; + + for (begin = (const char *) haystack; begin <= last_possible; ++begin) + if (begin[0] == ((const char *) needle)[0] && + !memcmp ((const void *) &begin[1], + (const void *) ((const char *) needle + 1), + needle_len - 1)) + return (void *) begin; + + return NULL; +} diff --git a/lib/os_internal.h b/lib/os_internal.h index 4b00882b7..81b5ec8c5 100644 --- a/lib/os_internal.h +++ b/lib/os_internal.h @@ -339,4 +339,13 @@ void xine_private_rewinddir(DIR *); #endif +/* replacement of memmem */ +#ifndef HAVE_MEMMEM +#define HAVE_MEMMEM +#define memmem(H, HL, N, NL) \ + xine_private_memmem((H), (HL), (N), (NL)) +void *xine_internal_memmem (const void *haystack, size_t haystack_len, + const void *needle, size_t needle_len); +#endif + #endif |