diff --git a/configure.in b/configure.in index e40354a..e289ff2 100644 --- a/configure.in +++ b/configure.in @@ -1437,7 +1437,7 @@ AC_CHECK_FUNCS(fmod killpg wait4 waitpid fork spawnv syscall __syscall chroot ge setuid setgid daemon select_large_fdset setenv unsetenv\ mktime timegm gmtime_r clock_gettime gettimeofday poll ppoll\ pread sendfile shutdown sigaltstack dl_iterate_phdr\ - dup3 pipe2 posix_memalign memalign) + dup3 pipe2 posix_memalign memalign memmem) AC_CACHE_CHECK(for unsetenv returns a value, rb_cv_unsetenv_return_value, [AC_TRY_COMPILE([ @@ -2738,6 +2738,40 @@ if test "${universal_binary-no}" = yes ; then ])]) fi +AC_CACHE_CHECK(for broken memmem, rb_cv_broken_memmem, + [AC_TRY_RUN([ +#include + +int +main() +{ + char *str = "hogefugafoobar"; + char *rs = "foo"; + char *empty = ""; + char *p; + + p = memmem(str, strlen(str), rs, strlen(rs)); + if (p == str+8) { + p = memmem(str, strlen(str), empty, strlen(empty)); + if (p == str) + return 0; + else + return 1; + } + else { + return 1; + } +} + ], + rb_cv_broken_memmem=no, + rb_cv_broken_memmem=yes, + rb_cv_broken_memmem=yes) +]) + +if test "$rb_cv_broken_memmem" = yes; then + AC_DEFINE(BROKEN_MEMMEM, 1) +fi + CPPFLAGS="$CPPFLAGS "'$(DEFS)' test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}' if test -n "${cflags+set}"; then diff --git a/re.c b/re.c index 590e9b0..f79e1e4 100644 --- a/re.c +++ b/re.c @@ -97,6 +97,18 @@ rb_memcmp(const void *p1, const void *p2, long len) return memcmp(p1, p2, len); } +#if defined(HAVE_MEMMEM) && !defined(BROKEN_MEMMEM) +static inline long +rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n) +{ + const unsigned char *y; + + if (y = memmem(ys, n, xs, m)) + return y - ys; + else + return -1; +} +#else static inline long rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n) { @@ -132,6 +144,7 @@ rb_memsearch_ss(const unsigned char *xs, long m, const unsigned char *ys, long n } return y - ys - m; } +#endif static inline long rb_memsearch_qs(const unsigned char *xs, long m, const unsigned char *ys, long n)