Update from Gnulib
This incorporates:
2020-06-27 getloadavg: don’t depend on fopen-gnu
2020-06-25 c-dtoastr, c-ldtoastr: new modules
2020-06-01 getloadavg: fix double-increment bug
2020-06-01 tempname: use getrandom, not getentropy
2020-05-31 tempname: merge from glibc and coreutils
2020-05-31 getentropy: work around a macOS and Solaris problem
2020-05-31 fnmatch: merge from glibc
2020-05-30 unistd: remove conflicting declaration of getrandom
2020-05-30 don't assume that UNICODE is not defined
2020-05-29 fix compilation error on native Windows
2020-05-28 avoid dynamic loading of Windows API functions when possible
2020-05-28 at-internal: make more robust in multithreaded applications
2020-05-28 getloadavg: make more robust in multithreaded applications
2020-05-27 getloadavg: make more robust in multithreaded applications
2020-05-26 count-one-bits: fix MSVC specific code
2020-05-25 getentropy, getrandom: new modules
2020-05-24 open, openat: really support O_CLOEXEC
2020-05-23 verify: document ‘assume’ better
2020-05-21 regex: configure better with "clang -fsanitize=leak"
2020-05-21 memmem: configure better with "clang -fsanitize=undefined"
2020-05-19 ftoastr: fix ifndef typo
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/count-one-bits.h, lib/ftoastr.c, lib/ftoastr.h:
* lib/getloadavg.c, lib/gettimeofday.c, lib/libc-config.h:
* lib/open.c, lib/openat-proc.c, lib/tempname.c, lib/tempname.h:
* lib/unistd.in.h, lib/verify.h, m4/memmem.m4, m4/regex.m4:
* m4/unistd_h.m4:
Update from Gnulib.
* lib/getrandom.c, lib/sys_random.in.h:
* m4/getrandom.m4, m4/sys_random_h.m4:
New files, copied from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
2020-06-27 17:00:17 +00:00
|
|
|
# memmem.m4 serial 27
|
2020-01-01 00:19:43 +00:00
|
|
|
dnl Copyright (C) 2002-2004, 2007-2020 Free Software Foundation, Inc.
|
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple.
(AVOIDED_MODULES): Add memchr.
* configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/fingerprint.c: New file.
* lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files,
copied from Gnulib.
* lib/fingerprint.h: Rename from src/fingerprint.h.
* lib-src/make-fingerprint.c: Include limits.h, sys/stat.h,
fingerprint.h, intprops.h, min-max.h.
(SSIZE_MAX): New macro, if not already defined.
(main): Without -r, Replace the fingerprint in the input file
instead of generating a fingerprint.c.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT):
New macros.
(temacs$(EXEEXT)): Use them to replace the fingerprint instead
of precalculating it.
(mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
2019-04-14 23:31:24 +00:00
|
|
|
dnl This file is free software; the Free Software Foundation
|
|
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
|
|
|
|
dnl Check that memmem is present and functional.
|
|
|
|
AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE],
|
|
|
|
[
|
|
|
|
dnl Persuade glibc <string.h> to declare memmem().
|
|
|
|
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
|
|
|
|
|
|
|
|
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
|
|
|
|
AC_CHECK_FUNCS([memmem])
|
|
|
|
if test $ac_cv_func_memmem = yes; then
|
|
|
|
HAVE_MEMMEM=1
|
|
|
|
else
|
|
|
|
HAVE_MEMMEM=0
|
|
|
|
fi
|
|
|
|
AC_CHECK_DECLS_ONCE([memmem])
|
|
|
|
if test $ac_cv_have_decl_memmem = no; then
|
|
|
|
HAVE_DECL_MEMMEM=0
|
|
|
|
else
|
|
|
|
dnl Detect https://sourceware.org/bugzilla/show_bug.cgi?id=12092.
|
|
|
|
dnl Also check that we handle empty needles correctly.
|
|
|
|
AC_CACHE_CHECK([whether memmem works],
|
|
|
|
[gl_cv_func_memmem_works_always],
|
|
|
|
[AC_RUN_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#include <string.h> /* for memmem */
|
|
|
|
#define P "_EF_BF_BD"
|
|
|
|
#define HAYSTACK "F_BD_CE_BD" P P P P "_C3_88_20" P P P "_C3_A7_20" P
|
|
|
|
#define NEEDLE P P P P P
|
|
|
|
]], [[
|
|
|
|
int result = 0;
|
|
|
|
if (memmem (HAYSTACK, strlen (HAYSTACK), NEEDLE, strlen (NEEDLE)))
|
|
|
|
result |= 1;
|
|
|
|
/* Check for empty needle behavior. */
|
|
|
|
{
|
|
|
|
const char *haystack = "AAA";
|
Update from Gnulib
This incorporates:
2020-06-27 getloadavg: don’t depend on fopen-gnu
2020-06-25 c-dtoastr, c-ldtoastr: new modules
2020-06-01 getloadavg: fix double-increment bug
2020-06-01 tempname: use getrandom, not getentropy
2020-05-31 tempname: merge from glibc and coreutils
2020-05-31 getentropy: work around a macOS and Solaris problem
2020-05-31 fnmatch: merge from glibc
2020-05-30 unistd: remove conflicting declaration of getrandom
2020-05-30 don't assume that UNICODE is not defined
2020-05-29 fix compilation error on native Windows
2020-05-28 avoid dynamic loading of Windows API functions when possible
2020-05-28 at-internal: make more robust in multithreaded applications
2020-05-28 getloadavg: make more robust in multithreaded applications
2020-05-27 getloadavg: make more robust in multithreaded applications
2020-05-26 count-one-bits: fix MSVC specific code
2020-05-25 getentropy, getrandom: new modules
2020-05-24 open, openat: really support O_CLOEXEC
2020-05-23 verify: document ‘assume’ better
2020-05-21 regex: configure better with "clang -fsanitize=leak"
2020-05-21 memmem: configure better with "clang -fsanitize=undefined"
2020-05-19 ftoastr: fix ifndef typo
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/count-one-bits.h, lib/ftoastr.c, lib/ftoastr.h:
* lib/getloadavg.c, lib/gettimeofday.c, lib/libc-config.h:
* lib/open.c, lib/openat-proc.c, lib/tempname.c, lib/tempname.h:
* lib/unistd.in.h, lib/verify.h, m4/memmem.m4, m4/regex.m4:
* m4/unistd_h.m4:
Update from Gnulib.
* lib/getrandom.c, lib/sys_random.in.h:
* m4/getrandom.m4, m4/sys_random_h.m4:
New files, copied from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
2020-06-27 17:00:17 +00:00
|
|
|
if (memmem (haystack, 3, (const char *) 1, 0) != haystack)
|
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple.
(AVOIDED_MODULES): Add memchr.
* configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/fingerprint.c: New file.
* lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files,
copied from Gnulib.
* lib/fingerprint.h: Rename from src/fingerprint.h.
* lib-src/make-fingerprint.c: Include limits.h, sys/stat.h,
fingerprint.h, intprops.h, min-max.h.
(SSIZE_MAX): New macro, if not already defined.
(main): Without -r, Replace the fingerprint in the input file
instead of generating a fingerprint.c.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT):
New macros.
(temacs$(EXEEXT)): Use them to replace the fingerprint instead
of precalculating it.
(mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
2019-04-14 23:31:24 +00:00
|
|
|
result |= 2;
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
]])],
|
|
|
|
[gl_cv_func_memmem_works_always=yes],
|
|
|
|
[gl_cv_func_memmem_works_always=no],
|
|
|
|
[dnl glibc 2.9..2.12 and cygwin 1.7.7 have issue #12092 above.
|
|
|
|
dnl Also empty needles work on glibc >= 2.1 and cygwin >= 1.7.0.
|
|
|
|
dnl uClibc is not affected, since it uses different source code.
|
|
|
|
dnl Assume that it works on all other platforms (even if not linear).
|
|
|
|
AC_EGREP_CPP([Lucky user],
|
|
|
|
[
|
|
|
|
#ifdef __GNU_LIBRARY__
|
|
|
|
#include <features.h>
|
|
|
|
#if ((__GLIBC__ == 2 && ((__GLIBC_MINOR > 0 && __GLIBC_MINOR__ < 9) \
|
|
|
|
|| __GLIBC_MINOR__ > 12)) \
|
|
|
|
|| (__GLIBC__ > 2)) \
|
|
|
|
|| defined __UCLIBC__
|
|
|
|
Lucky user
|
|
|
|
#endif
|
|
|
|
#elif defined __CYGWIN__
|
|
|
|
#include <cygwin/version.h>
|
|
|
|
#if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 7)
|
|
|
|
Lucky user
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
Lucky user
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
[gl_cv_func_memmem_works_always="guessing yes"],
|
Update from Gnulib
This incorporates:
2019-09-22 Update some URLs
2019-09-15 fcntl-h: fix compilation error of creat.c on MSVC
2019-09-15 creat: new module
2019-09-15 access: new module
2019-09-09 Add option to assume best, not worst, when cross-compiling.
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/careadlinkat.c, lib/careadlinkat.h, lib/count-leading-zeros.h:
* lib/count-trailing-zeros.h, lib/diffseq.h, lib/fcntl.in.h:
* lib/ftoastr.c, lib/get-permissions.c:
* lib/ieee754.in.h, lib/inttypes.in.h, lib/mktime.c, lib/open.c:
* lib/pathmax.h, lib/pipe2.c, lib/stddef.in.h, lib/stdint.in.h:
* lib/stdlib.in.h, lib/str-two-way.h, lib/string.in.h, lib/time.in.h:
* lib/timegm.c, lib/unistd.in.h, m4/canonicalize.m4:
* m4/extern-inline.m4, m4/fcntl_h.m4, m4/fdopendir.m4:
* m4/getgroups.m4, m4/getopt.m4, m4/gettimeofday.m4:
* m4/gnulib-common.m4, m4/largefile.m4:
* m4/lstat.m4, m4/memmem.m4, m4/mktime.m4, m4/nocrash.m4, m4/open.m4:
* m4/pselect.m4, m4/putenv.m4, m4/readlink.m4, m4/regex.m4:
* m4/symlink.m4, m4/unistd_h.m4, m4/utimens.m4, m4/utimes.m4:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* m4/open-slash.m4: New file, copied from Gnulib.
2019-09-23 06:50:59 +00:00
|
|
|
[gl_cv_func_memmem_works_always="$gl_cross_guess_normal"])
|
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple.
(AVOIDED_MODULES): Add memchr.
* configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/fingerprint.c: New file.
* lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files,
copied from Gnulib.
* lib/fingerprint.h: Rename from src/fingerprint.h.
* lib-src/make-fingerprint.c: Include limits.h, sys/stat.h,
fingerprint.h, intprops.h, min-max.h.
(SSIZE_MAX): New macro, if not already defined.
(main): Without -r, Replace the fingerprint in the input file
instead of generating a fingerprint.c.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT):
New macros.
(temacs$(EXEEXT)): Use them to replace the fingerprint instead
of precalculating it.
(mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
2019-04-14 23:31:24 +00:00
|
|
|
])
|
|
|
|
])
|
|
|
|
case "$gl_cv_func_memmem_works_always" in
|
|
|
|
*yes) ;;
|
|
|
|
*)
|
|
|
|
REPLACE_MEMMEM=1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
gl_PREREQ_MEMMEM
|
|
|
|
]) # gl_FUNC_MEMMEM_SIMPLE
|
|
|
|
|
|
|
|
dnl Additionally, check that memmem has linear performance characteristics
|
|
|
|
AC_DEFUN([gl_FUNC_MEMMEM],
|
|
|
|
[
|
|
|
|
AC_REQUIRE([gl_FUNC_MEMMEM_SIMPLE])
|
|
|
|
if test $HAVE_DECL_MEMMEM = 1 && test $REPLACE_MEMMEM = 0; then
|
|
|
|
AC_CACHE_CHECK([whether memmem works in linear time],
|
|
|
|
[gl_cv_func_memmem_works_fast],
|
|
|
|
[AC_RUN_IFELSE([AC_LANG_PROGRAM([[
|
|
|
|
#include <signal.h> /* for signal */
|
|
|
|
#include <string.h> /* for memmem */
|
|
|
|
#include <stdlib.h> /* for malloc */
|
|
|
|
#include <unistd.h> /* for alarm */
|
|
|
|
static void quit (int sig) { _exit (sig + 128); }
|
|
|
|
]], [[
|
|
|
|
int result = 0;
|
|
|
|
size_t m = 1000000;
|
|
|
|
char *haystack = (char *) malloc (2 * m + 1);
|
|
|
|
char *needle = (char *) malloc (m + 1);
|
|
|
|
/* Failure to compile this test due to missing alarm is okay,
|
|
|
|
since all such platforms (mingw) also lack memmem. */
|
|
|
|
signal (SIGALRM, quit);
|
|
|
|
alarm (5);
|
|
|
|
/* Check for quadratic performance. */
|
|
|
|
if (haystack && needle)
|
|
|
|
{
|
|
|
|
memset (haystack, 'A', 2 * m);
|
|
|
|
haystack[2 * m] = 'B';
|
|
|
|
memset (needle, 'A', m);
|
|
|
|
needle[m] = 'B';
|
|
|
|
if (!memmem (haystack, 2 * m + 1, needle, m + 1))
|
|
|
|
result |= 1;
|
|
|
|
}
|
|
|
|
/* Free allocated memory, in case some sanitizer is watching. */
|
|
|
|
free (haystack);
|
|
|
|
free (needle);
|
|
|
|
return result;
|
|
|
|
]])],
|
|
|
|
[gl_cv_func_memmem_works_fast=yes], [gl_cv_func_memmem_works_fast=no],
|
|
|
|
[dnl Only glibc >= 2.9 and cygwin > 1.7.0 are known to have a
|
|
|
|
dnl memmem that works in linear time.
|
|
|
|
AC_EGREP_CPP([Lucky user],
|
|
|
|
[
|
|
|
|
#include <features.h>
|
|
|
|
#ifdef __GNU_LIBRARY__
|
|
|
|
#if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 9) || (__GLIBC__ > 2)) \
|
|
|
|
&& !defined __UCLIBC__
|
|
|
|
Lucky user
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifdef __CYGWIN__
|
|
|
|
#include <cygwin/version.h>
|
|
|
|
#if CYGWIN_VERSION_DLL_COMBINED > CYGWIN_VERSION_DLL_MAKE_COMBINED (1007, 0)
|
|
|
|
Lucky user
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
],
|
|
|
|
[gl_cv_func_memmem_works_fast="guessing yes"],
|
Update from Gnulib
This incorporates:
2019-09-22 Update some URLs
2019-09-15 fcntl-h: fix compilation error of creat.c on MSVC
2019-09-15 creat: new module
2019-09-15 access: new module
2019-09-09 Add option to assume best, not worst, when cross-compiling.
* build-aux/config.guess, build-aux/config.sub, doc/misc/texinfo.tex:
* lib/careadlinkat.c, lib/careadlinkat.h, lib/count-leading-zeros.h:
* lib/count-trailing-zeros.h, lib/diffseq.h, lib/fcntl.in.h:
* lib/ftoastr.c, lib/get-permissions.c:
* lib/ieee754.in.h, lib/inttypes.in.h, lib/mktime.c, lib/open.c:
* lib/pathmax.h, lib/pipe2.c, lib/stddef.in.h, lib/stdint.in.h:
* lib/stdlib.in.h, lib/str-two-way.h, lib/string.in.h, lib/time.in.h:
* lib/timegm.c, lib/unistd.in.h, m4/canonicalize.m4:
* m4/extern-inline.m4, m4/fcntl_h.m4, m4/fdopendir.m4:
* m4/getgroups.m4, m4/getopt.m4, m4/gettimeofday.m4:
* m4/gnulib-common.m4, m4/largefile.m4:
* m4/lstat.m4, m4/memmem.m4, m4/mktime.m4, m4/nocrash.m4, m4/open.m4:
* m4/pselect.m4, m4/putenv.m4, m4/readlink.m4, m4/regex.m4:
* m4/symlink.m4, m4/unistd_h.m4, m4/utimens.m4, m4/utimes.m4:
Copy from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* m4/open-slash.m4: New file, copied from Gnulib.
2019-09-23 06:50:59 +00:00
|
|
|
[gl_cv_func_memmem_works_fast="$gl_cross_guess_normal"])
|
Replace executable’s fingerprint in place
* admin/merge-gnulib (GNULIB_MODULES): Add memmem-simple.
(AVOIDED_MODULES): Add memchr.
* configure.ac (HAVE_PDUMPER): AC_SUBST it, too, for use in makefiles.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/fingerprint.c: New file.
* lib/memmem.c, lib/str-two-way.h, m4/memmem.m4: New files,
copied from Gnulib.
* lib/fingerprint.h: Rename from src/fingerprint.h.
* lib-src/make-fingerprint.c: Include limits.h, sys/stat.h,
fingerprint.h, intprops.h, min-max.h.
(SSIZE_MAX): New macro, if not already defined.
(main): Without -r, Replace the fingerprint in the input file
instead of generating a fingerprint.c.
* lib/Makefile.in (libgnu_a_OBJECTS): Add fingerprint.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* src/Makefile.in (HAVE_PDUMPER, MAKE_PDUMPER_FINGERPRINT):
New macros.
(temacs$(EXEEXT)): Use them to replace the fingerprint instead
of precalculating it.
(mostlyclean, ctagsfiles1): Do not worry about fingerprint.c.
2019-04-14 23:31:24 +00:00
|
|
|
])
|
|
|
|
])
|
|
|
|
case "$gl_cv_func_memmem_works_fast" in
|
|
|
|
*yes) ;;
|
|
|
|
*)
|
|
|
|
REPLACE_MEMMEM=1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
]) # gl_FUNC_MEMMEM
|
|
|
|
|
|
|
|
# Prerequisites of lib/memmem.c.
|
|
|
|
AC_DEFUN([gl_PREREQ_MEMMEM], [:])
|