Replace memstr with memmem, see continued discussion on bug-gnulib.
gl_SOURCE_BASE(gl)
gl_M4_BASE(gl/m4)
-gl_MODULES(getline error exit progname getpass-gnu minmax memstr)
+gl_MODULES(getline error exit progname getpass-gnu minmax memmem)
gl_INIT
AC_MSG_RESULT([***
# Generated by gnulib-tool.
#
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool error exit extensions getline getpass-gnu gettext memstr minmax progname stdbool unlocked-io
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool error exit getline getpass-gnu gettext memmem minmax progname stdbool
AUTOMAKE_OPTIONS = 1.8 gnits
libgnu_la_SOURCES += exit.h
-
libgnu_la_SOURCES += getline.h
EXTRA_DIST += getndelim2.h getndelim2.c
libgnu_la_SOURCES += gettext.h
-libgnu_la_SOURCES += memstr.h
+libgnu_la_SOURCES += memmem.h
libgnu_la_SOURCES += minmax.h
mv $@-t $@
MOSTLYCLEANFILES += stdbool.h stdbool.h-t
-libgnu_la_SOURCES += unlocked-io.h
-
# Makefile.am ends here
# define mbsrtowcs __mbsrtowcs
#endif
-#if !_LIBC
+#if USE_UNLOCKED_IO
# include "unlocked-io.h"
#endif
#include <stdlib.h>
#include <stddef.h>
-#include "unlocked-io.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
#include <limits.h>
#if HAVE_INTTYPES_H
-/* Copyright (C) 1992-2001, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1992-2001, 2003, 2004 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
#if _LIBC
# define flockfile(s) _IO_flockfile (s)
# define funlockfile(s) _IO_funlockfile (s)
-#else
+#elif USE_UNLOCKED_IO
# include "unlocked-io.h"
#endif
# Generated by gnulib-tool.
#
# Invoked as: gnulib-tool --import
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool error exit extensions getline getpass-gnu gettext memstr minmax progname stdbool unlocked-io
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --libtool error exit getline getpass-gnu gettext memmem minmax progname stdbool
AC_DEFUN([gl_EARLY],
[
AC_GNU_SOURCE
- gl_USE_SYSTEM_EXTENSIONS
])
AC_DEFUN([gl_INIT],
[
gl_ERROR
- dnl gl_USE_SYSTEM_EXTENSIONS must be added quite early to configure.ac.
AM_FUNC_GETLINE
gl_FUNC_GETPASS_GNU
dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
- gl_FUNC_MEMSTR
+ gl_FUNC_MEMMEM
AM_STDBOOL_H
- gl_FUNC_GLIBC_UNLOCKED_IO
])
dnl Usage: gl_MODULES(module1 module2 ...)
-# memstr.m4 serial 1
+# memmem.m4 serial 1
dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
-AC_DEFUN([gl_FUNC_MEMSTR],
+AC_DEFUN([gl_FUNC_MEMMEM],
[
- AC_REPLACE_FUNCS(memstr)
- AC_CHECK_DECLS_ONCE(memstr)
- gl_PREREQ_MEMSTR
+ dnl Persuade glibc <string.h> to declare memmem().
+ AC_REQUIRE([AC_GNU_SOURCE])
+
+ AC_REPLACE_FUNCS(memmem)
+ AC_CHECK_DECLS_ONCE(memmem)
+ gl_PREREQ_MEMMEM
])
-# Prerequisites of lib/memstr.c.
-AC_DEFUN([gl_PREREQ_MEMSTR], [:])
+# Prerequisites of lib/memmem.c.
+AC_DEFUN([gl_PREREQ_MEMMEM], [:])
--- /dev/null
+/* Copyright (C) 1991,92,93,94,96,97,98,2000,2004 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+#include <stddef.h>
+#include <string.h>
+
+#ifndef _LIBC
+# define __builtin_expect(expr, val) (expr)
+#endif
+
+#undef memmem
+
+/* Return the first occurrence of NEEDLE in HAYSTACK. */
+void *
+memmem (haystack, haystack_len, needle, needle_len)
+ 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 (__builtin_expect (haystack_len < needle_len, 0))
+ 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;
+}
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
* 02111-1307, USA. */
-#ifndef MEMSTR_H
-# define MEMSTR_H
+#ifndef MEMMEM_H
+# define MEMMEM_H
-/* Get memstr, if available. */
+/* Get memmem, if available. */
# include <string.h>
-# if defined HAVE_DECL_MEMSTR && !HAVE_DECL_MEMSTR
-char *memstr (const char *big, const char *little, size_t len);
+# if defined HAVE_DECL_MEMMEM && !HAVE_DECL_MEMMEM
+void *
+memmem (const void *haystack, size_t haystack_len,
+ const void *needle, size_t needle_len);
# endif
-#endif /* MEMSTR_H */
+#endif /* MEMMEM_H */
+++ /dev/null
-/*
- * Copyright (C) 2004 Free Software Foundation
- * Written by Simon Josefsson
- *
- * 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., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA. */
-
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-
-/* Get strlen, strncmp, size_t. */
-#include <string.h>
-
-/* Locate first occurance of zero terminated string LITTLE in the
- first LEN characters of the string BIG. The terminating zero in
- LITTLE is not used for comparison. Return pointer to match within
- BIG, or NULL if no match is found. If LITTLE is the empty string,
- BIG is returned. */
-char *
-memstr (const char *big, const char *little, size_t len)
-{
- size_t littlelen = strlen (little);
- char *p = (char*) big;
- size_t i;
-
- if (*little == '\0')
- return p;
-
- if (len < littlelen)
- return NULL;
-
- for (i = 0; i <= len - littlelen; i++)
- if (memcmp (&p[i], little, littlelen) == 0)
- return &p[i];
-
- return NULL;
-}
+++ /dev/null
-/* Prefer faster, non-thread-safe stdio functions if available.
-
- Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
- 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-/* Written by Jim Meyering. */
-
-#ifndef UNLOCKED_IO_H
-# define UNLOCKED_IO_H 1
-
-# ifndef USE_UNLOCKED_IO
-# define USE_UNLOCKED_IO 1
-# endif
-
-# if USE_UNLOCKED_IO
-
-/* These are wrappers for functions/macros from the GNU C library, and
- from other C libraries supporting POSIX's optional thread-safe functions.
-
- The standard I/O functions are thread-safe. These *_unlocked ones are
- more efficient but not thread-safe. That they're not thread-safe is
- fine since all of the applications in this package are single threaded.
-
- Also, some code that is shared with the GNU C library may invoke
- the *_unlocked functions directly. On hosts that lack those
- functions, invoke the non-thread-safe versions instead. */
-
-# include <stdio.h>
-
-# if HAVE_DECL_CLEARERR_UNLOCKED
-# undef clearerr
-# define clearerr(x) clearerr_unlocked (x)
-# else
-# define clearerr_unlocked(x) clearerr (x)
-# endif
-# if HAVE_DECL_FEOF_UNLOCKED
-# undef feof
-# define feof(x) feof_unlocked (x)
-# else
-# define feof_unlocked(x) feof (x)
-# endif
-# if HAVE_DECL_FERROR_UNLOCKED
-# undef ferror
-# define ferror(x) ferror_unlocked (x)
-# else
-# define ferror_unlocked(x) ferror (x)
-# endif
-# if HAVE_DECL_FFLUSH_UNLOCKED
-# undef fflush
-# define fflush(x) fflush_unlocked (x)
-# else
-# define fflush_unlocked(x) fflush (x)
-# endif
-# if HAVE_DECL_FGETS_UNLOCKED
-# undef fgets
-# define fgets(x,y,z) fgets_unlocked (x,y,z)
-# else
-# define fgets_unlocked(x,y,z) fgets (x,y,z)
-# endif
-# if HAVE_DECL_FPUTC_UNLOCKED
-# undef fputc
-# define fputc(x,y) fputc_unlocked (x,y)
-# else
-# define fputc_unlocked(x,y) fputc (x,y)
-# endif
-# if HAVE_DECL_FPUTS_UNLOCKED
-# undef fputs
-# define fputs(x,y) fputs_unlocked (x,y)
-# else
-# define fputs_unlocked(x,y) fputs (x,y)
-# endif
-# if HAVE_DECL_FREAD_UNLOCKED
-# undef fread
-# define fread(w,x,y,z) fread_unlocked (w,x,y,z)
-# else
-# define fread_unlocked(w,x,y,z) fread (w,x,y,z)
-# endif
-# if HAVE_DECL_FWRITE_UNLOCKED
-# undef fwrite
-# define fwrite(w,x,y,z) fwrite_unlocked (w,x,y,z)
-# else
-# define fwrite_unlocked(w,x,y,z) fwrite (w,x,y,z)
-# endif
-# if HAVE_DECL_GETC_UNLOCKED
-# undef getc
-# define getc(x) getc_unlocked (x)
-# else
-# define getc_unlocked(x) getc (x)
-# endif
-# if HAVE_DECL_GETCHAR_UNLOCKED
-# undef getchar
-# define getchar() getchar_unlocked ()
-# else
-# define getchar_unlocked() getchar ()
-# endif
-# if HAVE_DECL_PUTC_UNLOCKED
-# undef putc
-# define putc(x,y) putc_unlocked (x,y)
-# else
-# define putc_unlocked(x,y) putc (x,y)
-# endif
-# if HAVE_DECL_PUTCHAR_UNLOCKED
-# undef putchar
-# define putchar(x) putchar_unlocked (x)
-# else
-# define putchar_unlocked(x) putchar (x)
-# endif
-
-# undef flockfile
-# define flockfile(x) ((void) 0)
-
-# undef ftrylockfile
-# define ftrylockfile(x) 0
-
-# undef funlockfile
-# define funlockfile(x) ((void) 0)
-
-# endif /* USE_UNLOCKED_IO */
-#endif /* UNLOCKED_IO_H */
# include <strings.h>
#endif
-#include <memstr.h>
+#include <memmem.h>
#ifdef HAVE_STDDEF_H
# include <stddef.h>
int ret, count;
#ifdef ENABLE_PKI
- if ((ptr =
- memstr(input_cert, PEM_PKCS7_SEP, input_cert_size)) != NULL) {
+ if ((ptr = memmem(input_cert, input_cert_size,
+ PEM_PKCS7_SEP, sizeof (PEM_PKCS7_SEP) - 1)) != NULL) {
size = strlen(ptr);
ret = parse_pkcs7_cert_mem(cert_list, ncerts, ptr, size, CERT_PEM);
/* move to the certificate
*/
- ptr = memstr(input_cert, PEM_CERT_SEP, input_cert_size);
+ ptr = memmem(input_cert, input_cert_size,
+ PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
if (ptr == NULL)
- ptr = memstr(input_cert, PEM_CERT_SEP2, input_cert_size);
+ ptr = memmem(input_cert, input_cert_size,
+ PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
if (ptr == NULL) {
gnutls_assert();
if (size > 0) {
char *ptr2;
- ptr2 = memstr(ptr, PEM_CERT_SEP, size);
+ ptr2 = memmem(ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
if (ptr2 == NULL)
- ptr2 = memstr(ptr, PEM_CERT_SEP2, size);
+ ptr2 = memmem(ptr, size, PEM_CERT_SEP2,
+ sizeof (PEM_CERT_SEP2) - 1);
ptr = ptr2;
} else
/* move to the certificate
*/
- ptr = memstr(input_cert, PEM_CERT_SEP, input_cert_size);
+ ptr = memmem(input_cert, input_cert_size,
+ PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
if (ptr == NULL)
- ptr = memstr(input_cert, PEM_CERT_SEP2, input_cert_size);
+ ptr = memmem(input_cert, input_cert_size,
+ PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
if (ptr == NULL) {
gnutls_assert();
if (size > 0) {
char *ptr2;
- ptr2 = memstr(ptr, PEM_CERT_SEP, size);
+ ptr2 = memmem(ptr, size, PEM_CERT_SEP, sizeof (PEM_CERT_SEP) - 1);
if (ptr2 == NULL)
- ptr = memstr(ptr, PEM_CERT_SEP2, size);
+ ptr = memmem(ptr, size,
+ PEM_CERT_SEP2, sizeof (PEM_CERT_SEP2) - 1);
ptr = ptr2;
} else
/* move to the certificate
*/
- ptr = memstr(input_crl, PEM_CRL_SEP, input_crl_size);
+ ptr = memmem(input_crl, input_crl_size,
+ PEM_CRL_SEP, sizeof (PEM_CRL_SEP) -1);
if (ptr == NULL) {
gnutls_assert();
return GNUTLS_E_BASE64_DECODING_ERROR;
size = input_crl_size - (ptr - input_crl);
if (size > 0)
- ptr = memstr(ptr, PEM_CRL_SEP, size);
+ ptr = memmem(ptr, size, PEM_CRL_SEP, sizeof (PEM_CRL_SEP) - 1);
else
ptr = NULL;
i++;
if (header != NULL)
_gnutls_str_cat(pem_header, sizeof(pem_header), header);
- rdata = memstr(data, pem_header, data_size);
+ rdata = memmem(data, data_size, pem_header, strlen (pem_header));
if (rdata == NULL) {
gnutls_assert();
return GNUTLS_E_BASE64_DECODING_ERROR;
}
- kdata = memstr(rdata, ENDSTR, data_size);
+ kdata = memmem(rdata, data_size, ENDSTR, sizeof (ENDSTR) - 1);
/* allow CR as well.
*/
if (kdata == NULL)
- kdata = memstr(rdata, ENDSTR2, data_size);
+ kdata = memmem(rdata, data_size, ENDSTR2, sizeof (ENDSTR2) - 1);
if (kdata == NULL) {
gnutls_assert();
/* position is now after the ---BEGIN--- headers */
- kdata = memstr(rdata, bottom, data_size);
+ kdata = memmem(rdata, data_size, bottom, strlen (bottom));
if (kdata == NULL) {
gnutls_assert();
return GNUTLS_E_BASE64_DECODING_ERROR;
projects / thirdparty / gnutls.git / commitdiff
