mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-15 04:31:49 +08:00
c0c3707ff4
This patch allows us to remove a workaround in common-defs.h due to the gnulib fix in: https://lists.gnu.org/archive/html/bug-gnulib/2019-11/msg00024.html All of GDB's local Gnulib patches were already fixed upstream per their descriptions, so this patch removes them all. The problem listed here: https://sourceware.org/ml/gdb-patches/2019-08/msg00553.html was probably partially fixed by moving gnulib to the toplevel; for the remainder, I am setting MAKEOVERRIDES to empty in gnulib/Makefile.am. See also the comment there (it fixes an issue with compilers that don't use C99/C11 by default such as GCC 4.8.5, the default on Centos 7). gdb/ChangeLog: 2019-12-16 Christian Biesinger <cbiesinger@google.com> * gdbsupport/common-defs.h: Remove workaround for a gnulib bug (we no longer need to include time.h before pathmax.h) gnulib/ChangeLog: 2019-12-16 Christian Biesinger <cbiesinger@google.com> * Makefile.am: Set MAKEOVERRIDES. * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * config.in: Regenerate. * configure: Regenerate. * import/Makefile.am: Update. * import/Makefile.in: Regenerate. * import/_Noreturn.h: New file. * import/alloca.c (i00afunc): Update. * import/alloca.in.h (if): Update. * import/arg-nonnull.h: Rename from import/extra/snippet/arg-nonnull.h. * import/arpa_inet.in.h (if): Update. * import/assure.h: Update. * import/at-func.c: Update. * import/basename-lgpl.c: Update. * import/canonicalize-lgpl.c (if): Update. * import/c++defs.h: Rename from import/extra/snippet/c++defs.h. * import/cdefs.h: New file. * import/chdir-long.c: Update. * import/chdir-long.h: Update. * import/cloexec.c: Update. * import/cloexec.h: Update. * import/close.c: Update. * import/closedir.c: Update. * import/config.charset: Remove. * import/dirent-private.h: Update. * import/dirent.in.h: Update. * import/dirfd.c: Update. * import/dirname-lgpl.c: Update. * import/dirname.h (base_name): Update. * import/dosname.h (if): Update. * import/dup-safer-flag.c: New file. * import/dup-safer.c: Update. * import/dup.c: Update. * import/dup2.c (if): Update. (dup2_nothrow): Update. (ms_windows_dup2): Update. * import/errno.in.h (if): Update. (elif): Update. * import/error.c (if): Update. (strerror_r): Update. (program_name): Update. (error): Update. (error_at_line): Update. * import/error.h: Update. * import/exitfail.c: Update. * import/exitfail.h: Update. * import/extra/config.rpath: Update. * import/extra/snippet/_Noreturn.h: Remove. * import/extra/update-copyright: Update. * import/fchdir.c: Update. * import/fcntl.c (rpl_fcntl): Update. (INCL_DOS): Update. (if): Update. (rpl_fcntl_DUPFD): Update. (rpl_fcntl_DUPFD_CLOEXEC): Update. (klibc_fcntl): Update. (fcntl): Update. (have_dupfd_cloexec): Update. * import/fcntl.in.h (if): Update. (creat): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (O_CLOEXEC): Update. (GNULIB_defined_O_CLOEXEC): Update. * import/fd-hook.c: Update. * import/fd-hook.h: Update. * import/fd-safer-flag.c: New file. * import/fd-safer.c: Update. * import/fdopendir.c: Update. * import/filename.h: Update. * import/filenamecat-lgpl.c (longest_relative_suffix): Update. (mfile_name_concat): Update. * import/filenamecat.h: Update. * import/flexmember.h: Update. * import/float+.h: Update. * import/float.c: Update. * import/float.in.h (LDBL_MIN): Update. * import/fnmatch.c (__builtin_expect): Update. (FALLTHROUGH): Update. * import/fnmatch.in.h (_FNMATCH_H): Update. (_): Update. (fnmatch): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/fnmatch_loop.c (FCT): Update. (EXT): Update. * import/fpucw.h (GET_FPUCW): Update. (SET_FPUCW): Update. * import/frexp.c: Update. * import/frexpl.c: Update. * import/fstat.c (stat): Update. (fstat): Update. (WINDOWS_NATIVE): Update. (fstat_nothrow): Update. (WIN32_LEAN_AND_MEAN): Update. * import/fstatat.c (normal_fstatat): Update. (rpl_fstatat): Update. * import/getcwd-lgpl.c (rpl_getcwd): Update. * import/getcwd.c (getcwd_nothrow): Update. (getcwd_system): Update. (__getcwd): Update. * import/getdtablesize.c (if): Update. (_setmaxstdio): Update. (_setmaxstdio_nothrow): Update. (getdtablesize): Update. * import/getlogin_r.c (if): Update. (getlogin_r): Update. * import/getprogname.c (getprogname): Update. * import/getprogname.h: Update. * import/gettext.h (if): Update. * import/gettimeofday.c (WINDOWS_NATIVE): Update. (localtime): Update. (GetProcAddress): Update. (gmtime): Update. (void): Update. (struct tm): Update. (rpl_localtime): Update. (initialize): Update. (rpl_gmtime): Update. (tzset): Update. (rpl_tzset): Update. * import/glob-libc.h (_Restrict_): Update. (__size_t): Update. (__need_size_t): Update. (glob): Update. (globfree): Update. (__REDIRECT_NTH): Update. (glob64): Update. (globfree64): Update. (glob_pattern_p): Update. * import/glob.c (POSIX): Update. (if): Update. (__set_errno): Update. (getpwnam_r): Update. (__lstat64): Update. (FLEXIBLE_ARRAY_MEMBER): Update. (__glob_pattern_p): Update. (GETPW_R_SIZE_MAX): Update. (GET_LOGIN_NAME_MAX): Update. (DT_UNKNOWN): Update. (DT_DIR): Update. (DT_LNK): Update. (D_TYPE_TO_RESULT): Update. (readdir_result_might_be_symlink): Update. (readdir_result_might_be_dir): Update. (readdir_result_type): Update. (D_INO_TO_RESULT): Update. (READDIR_RESULT_INITIALIZER): Update. (attribute_hidden): Update. (__attribute_noinline__): Update. (__builtin_expect): Update. (__glibc_unlikely): Update. (__has_builtin): Update. (__glob_pattern_type): Update. (is_dir): Update. (glob): Update. (globfree): Update. (libc_hidden_def): Update. (DIRSEP_CHAR): Update. (prefix_array): Update. (weak_alias): Update. (link_exists2_p): Update. (link_exists_p): Update. (glob_in_dir): Update. (GLOBNAMES_MEMBERS): Update. * import/glob.in.h (_GL_GLOB_H): Update. (_): Update. (__BEGIN_DECLS): Update. (__END_DECLS): Update. (_Restrict_): Update. (__THROW): Update. (__THROWNL): Update. (__size_t): Update. (__USE_GNU): Update. (glob): Update. (globfree): Update. (glob_pattern_p): Update. (__glob_pattern_p): Update. (__GLOB_GNULIB): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_WARN_ON_USE): Update. * import/glob_internal.h: New file. * import/glob_pattern_p.c: New file. * import/globfree.c: New file. * import/glthread/lock.c (glthread_rwlock_init_for_glibc): Update. (glthread_rwlock_rdlock_multithreaded): Update. (glthread_once_call): Update. (glthread_once_multithreaded): Update. (glthread_once_singlethreaded): Update. (glthread_recursive_lock_init_multithreaded): Update. (glthread_recursive_lock_lock_multithreaded): Update. (glthread_recursive_lock_unlock_multithreaded): Update. (glthread_recursive_lock_destroy_multithreaded): Update. (glthread_lock_init_func): Update. (glthread_lock_lock_func): Update. (glthread_lock_unlock_func): Update. (glthread_lock_destroy_func): Update. (gl_waitqueue_t): Update. (gl_waitqueue_init): Update. (gl_waitqueue_add): Update. (gl_waitqueue_notify_first): Update. (gl_waitqueue_notify_all): Update. (glthread_rwlock_init_func): Update. (glthread_rwlock_rdlock_func): Update. (glthread_rwlock_wrlock_func): Update. (glthread_rwlock_unlock_func): Update. (glthread_rwlock_destroy_func): Update. (glthread_recursive_lock_init_func): Update. (glthread_recursive_lock_lock_func): Update. (glthread_recursive_lock_unlock_func): Update. (glthread_recursive_lock_destroy_func): Update. (glthread_once_func): Update. * import/glthread/lock.h (c11_threads_in_use): Update. (pthread_in_use): Update. (gl_rwlock_initializer): Update. (glthread_rwlock_init): Update. (glthread_rwlock_init_for_glibc): Update. (pth_in_use): Update. (gl_lock_define): Update. (gl_lock_define_initialized): Update. (gl_lock_initializer): Update. (glthread_lock_init): Update. (glthread_lock_lock): Update. (glthread_lock_unlock): Update. (glthread_lock_destroy): Update. (gl_rwlock_define): Update. (gl_rwlock_define_initialized): Update. (glthread_rwlock_rdlock): Update. (glthread_rwlock_wrlock): Update. (glthread_rwlock_unlock): Update. (glthread_rwlock_destroy): Update. (gl_recursive_lock_define): Update. (gl_recursive_lock_define_initialized): Update. (gl_recursive_lock_initializer): Update. (glthread_recursive_lock_init): Update. (glthread_recursive_lock_lock): Update. (glthread_recursive_lock_unlock): Update. (glthread_recursive_lock_destroy): Update. (gl_once_define): Update. (glthread_once): Update. (glthread_once_multithreaded): Update. (glthread_once_singlethreaded): Update. (thread_in_use): Update. (glthread_recursive_lock_init_multithreaded): Update. (glthread_recursive_lock_lock_multithreaded): Update. (glthread_recursive_lock_unlock_multithreaded): Update. (glthread_recursive_lock_destroy_multithreaded): Update. (glthread_lock_init_func): Update. (glthread_lock_lock_func): Update. (glthread_lock_unlock_func): Update. (glthread_lock_destroy_func): Update. (glthread_rwlock_init_func): Update. (glthread_rwlock_rdlock_func): Update. (glthread_rwlock_wrlock_func): Update. (glthread_rwlock_unlock_func): Update. (glthread_rwlock_destroy_func): Update. (glthread_recursive_lock_init_func): Update. (glthread_recursive_lock_lock_func): Update. (glthread_recursive_lock_unlock_func): Update. (glthread_recursive_lock_destroy_func): Update. (glthread_once_func): Update. * import/glthread/threadlib.c: Update. * import/hard-locale.c: Update. * import/hard-locale.h: Update. * import/inet_ntop.c: Update. * import/intprops.h (__has_builtin): Update. (_GL_INT_CONVERT): Update. (_GL_INT_NEGATE_CONVERT): Update. (verify): Update. (_GL_HAS_BUILTIN_OVERFLOW): Update. (_GL_HAS_BUILTIN_ADD_OVERFLOW): Update. (_GL_HAS_BUILTIN_OVERFLOW_P): Update. (_GL_HAS_BUILTIN_MUL_OVERFLOW): Update. (_GL_BINARY_OP_OVERFLOW): Update. (INT_ADD_WRAPV): Update. (INT_SUBTRACT_WRAPV): Update. (INT_MULTIPLY_WRAPV): Update. (_GL_INT_OP_WRAPV): Update. (_GL_INT_OP_WRAPV_SMALLISH): Update. (_GL_INT_OP_WRAPV_LONGISH): Update. (_GL_INT_OP_CALC): Update. (_GL_INT_OP_CALC1): Update. (_GL_INT_OP_WRAPV_VIA_UNSIGNED): Update. (_GL_INT_ADD_RANGE_OVERFLOW): Update. (_GL_INT_SUBTRACT_RANGE_OVERFLOW): Update. (_GL_INT_MULTIPLY_RANGE_OVERFLOW): Update. * import/inttypes.in.h (if): Update. * import/isnan.c: Update. * import/isnand-nolibm.h: Update. * import/isnand.c: Update. * import/isnanl-nolibm.h: Update. * import/isnanl.c: Update. * import/itold.c: Update. * import/libc-config.h: New file. * import/limits.in.h (LLONG_MIN): Update. (LLONG_MAX): Update. (ULLONG_MAX): Update. (WORD_BIT): Update. (LONG_BIT): Update. * import/localcharset.c (setlocale): Update. (relocate): Update. (O_NOFOLLOW): Update. (ISSLASH): Update. (DIRECTORY_SEPARATOR): Update. (getc): Update. (volatile): Update. (get_charset_aliases): Update. (struct table_entry): Update. (alias_table_defined): Update. (locale_table_defined): Update. (locale_charset): Update. (if): Update. * import/localcharset.h: Update. * import/localtime-buffer.c: New file. * import/localtime-buffer.h: New file. * import/lstat.c (rpl_lstat): Update. * import/m4/00gnulib.m4: Update. * import/m4/__inline.m4: New file. * import/m4/absolute-header.m4: Update. * import/m4/alloca.m4: Update. * import/m4/arpa_inet_h.m4: Update. * import/m4/builtin-expect.m4: New file. * import/m4/canonicalize.m4: Update. * import/m4/chdir-long.m4: Update. * import/m4/close.m4: Update. * import/m4/closedir.m4: Update. * import/m4/codeset.m4: Update. * import/m4/configmake.m4: Remove. * import/m4/d-ino.m4: Update. * import/m4/d-type.m4: Update. * import/m4/dirent_h.m4: Update. * import/m4/dirfd.m4: Update. * import/m4/dirname.m4: Update. * import/m4/double-slash-root.m4: Update. * import/m4/dup.m4: Update. * import/m4/dup2.m4: Update. * import/m4/eealloc.m4: Update. * import/m4/environ.m4: Update. * import/m4/errno_h.m4: Update. * import/m4/error.m4: Update. * import/m4/exponentd.m4: Update. * import/m4/exponentl.m4: Update. * import/m4/extensions.m4: Update. * import/m4/extern-inline.m4: Update. * import/m4/fchdir.m4: Update. * import/m4/fcntl-o.m4: Update. * import/m4/fcntl.m4: Update. * import/m4/fcntl_h.m4: Update. * import/m4/fdopendir.m4: Update. * import/m4/filenamecat.m4: Update. * import/m4/flexmember.m4: Update. * import/m4/float_h.m4: Update. * import/m4/fnmatch.m4: Update. * import/m4/fnmatch_h.m4: New file. * import/m4/fpieee.m4: Update. * import/m4/frexp.m4: Update. * import/m4/frexpl.m4: Update. * import/m4/fstat.m4: Update. * import/m4/fstatat.m4: Update. * import/m4/getcwd-abort-bug.m4: Update. * import/m4/getcwd-path-max.m4: Update. * import/m4/getcwd.m4: Update. * import/m4/getdtablesize.m4: Update. * import/m4/getlogin.m4: New file. * import/m4/getlogin_r.m4: Update. * import/m4/getpagesize.m4: New file. * import/m4/getprogname.m4: Update. * import/m4/gettimeofday.m4: Update. * import/m4/glibc21.m4: Remove. * import/m4/glob.m4: Update. * import/m4/glob_h.m4: New file. * import/m4/gnulib-cache.m4: Update. * import/m4/gnulib-common.m4: Update. * import/m4/gnulib-comp.m4: Update. * import/m4/gnulib-tool.m4: Update. * import/m4/hard-locale.m4: Remove. * import/m4/host-cpu-c-abi.m4: New file. * import/m4/include_next.m4: Update. * import/m4/inet_ntop.m4: Update. * import/m4/inttypes-pri.m4: Update. * import/m4/inttypes.m4: Update. * import/m4/isnand.m4: Update. * import/m4/isnanl.m4: Update. * import/m4/largefile.m4: Update. * import/m4/lib-ld.m4: Update. * import/m4/lib-link.m4: Update. * import/m4/lib-prefix.m4: Update. * import/m4/limits-h.m4: Update. * import/m4/localcharset.m4: Update. * import/m4/locale-fr.m4: Update. * import/m4/locale-ja.m4: Update. * import/m4/locale-zh.m4: Update. * import/m4/localtime-buffer.m4: New file. * import/m4/lock.m4: Update. * import/m4/longlong.m4: Update. * import/m4/lstat.m4: Update. * import/m4/malloc.m4: Update. * import/m4/malloca.m4: Update. * import/m4/math_h.m4: Update. * import/m4/mbrtowc.m4: Update. * import/m4/mbsinit.m4: Update. * import/m4/mbsrtowcs.m4: Update. * import/m4/mbstate_t.m4: Update. * import/m4/memchr.m4: Update. * import/m4/memmem.m4: Update. * import/m4/mempcpy.m4: Update. * import/m4/memrchr.m4: Update. * import/m4/mkdir.m4: Update. * import/m4/mkdtemp.m4: Update. * import/m4/mkostemp.m4: Update. * import/m4/mmap-anon.m4: Update. * import/m4/mode_t.m4: Update. * import/m4/msvc-inval.m4: Update. * import/m4/msvc-nothrow.m4: Update. * import/m4/multiarch.m4: Update. * import/m4/netinet_in_h.m4: Update. * import/m4/nocrash.m4: Update. * import/m4/off_t.m4: Update. * import/m4/onceonly.m4: Remove. * import/m4/open-cloexec.m4: New file. * import/m4/open-slash.m4: New file. * import/m4/open.m4: Update. * import/m4/openat.m4: Update. * import/m4/opendir.m4: Update. * import/m4/pathmax.m4: Update. * import/m4/pthread_rwlock_rdlock.m4: New file. * import/m4/rawmemchr.m4: Update. * import/m4/readdir.m4: Update. * import/m4/readlink.m4: Update. * import/m4/realloc.m4: Update. * import/m4/rename.m4: Update. * import/m4/rewinddir.m4: Update. * import/m4/rmdir.m4: Update. * import/m4/save-cwd.m4: Update. * import/m4/secure_getenv.m4: Remove. * import/m4/setenv.m4: Update. * import/m4/signal_h.m4: Update. * import/m4/socklen.m4: Update. * import/m4/sockpfaf.m4: Update. * import/m4/ssize_t.m4: Update. * import/m4/stat-time.m4: New file. * import/m4/stat.m4: Update. * import/m4/std-gnu11.m4: New file. * import/m4/stdalign.m4: Update. * import/m4/stdbool.m4: Update. * import/m4/stddef_h.m4: Update. * import/m4/stdint.m4: Update. * import/m4/stdio_h.m4: Update. * import/m4/stdlib_h.m4: Update. * import/m4/strchrnul.m4: Update. * import/m4/strdup.m4: Update. * import/m4/strerror.m4: Update. * import/m4/strerror_r.m4: Update. * import/m4/string_h.m4: Update. * import/m4/strstr.m4: Update. * import/m4/strtok_r.m4: Update. * import/m4/sys_socket_h.m4: Update. * import/m4/sys_stat_h.m4: Update. * import/m4/sys_time_h.m4: Update. * import/m4/sys_types_h.m4: Update. * import/m4/sys_uio_h.m4: Update. * import/m4/tempname.m4: Update. * import/m4/threadlib.m4: Update. * import/m4/time_h.m4: Update. * import/m4/time_r.m4: Update. * import/m4/unistd-safer.m4: Update. * import/m4/unistd_h.m4: Update. * import/m4/warn-on-use.m4: Update. * import/m4/wchar_h.m4: Update. * import/m4/wchar_t.m4: Update. * import/m4/wctype_h.m4: Update. * import/m4/wint_t.m4: Update. * import/malloc.c: Update. * import/malloc/scratch_buffer.h: New file. * import/malloc/scratch_buffer_grow.c: New file. * import/malloc/scratch_buffer_grow_preserve.c: New file. * import/malloc/scratch_buffer_set_array_size.c: New file. * import/malloca.c (MAGIC_NUMBER): Update. (MAGIC_SIZE): Update. (struct preliminary_header): Update. (HEADER_SIZE): Update. (union header): Update. (verify): Update. (HASH_TABLE_SIZE): Update. (freea): Update. * import/malloca.h (malloca): Update. (nmalloca): Update. * import/malloca.valgrind: Remove. * import/math.in.h (_GL_MATH_CXX_REAL_FLOATING_DECL_2): Update. (func): Update. (rpl_func): Update. (f): Update. (d): Update. (l): Update. (_GL_WARN_ON_USE): Update. (_GL_WARN_ON_USE_ATTRIBUTE): Update. (FP_ILOGB0): Update. (FP_ILOGBNAN): Update. (acosf): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (asinf): Update. (atanf): Update. (atan2f): Update. (cosf): Update. (coshf): Update. (expf): Update. (expl): Update. (expm1l): Update. (ilogbl): Update. (rintl): Update. (sinf): Update. (sinhf): Update. (sqrtf): Update. (tanf): Update. (tanhf): Update. (isfinite): Update. (isinf): Update. (isnan): Update. (GNULIB_defined_signbit): Update. (signbit): Update. * import/mbrtowc.c (FALLTHROUGH): Update. (locale_enc): Update. (locale_enc_cached): Update. (gl_lock_define_initialized): Update. (mbrtowc): Update. * import/mbsinit.c (if): Update. (mbsinit): Update. * import/mbsrtowcs-impl.h: Update. * import/mbsrtowcs-state.c: Update. * import/mbsrtowcs.c: Update. * import/memchr.c: Update. * import/memchr.valgrind: Update. * import/memmem.c (__builtin_expect): Update. * import/mempcpy.c: Update. * import/memrchr.c (__memrchr): Update. * import/mkdir.c (if): Update. * import/mkdtemp.c: Update. * import/mkostemp.c: Update. * import/msvc-inval.c: Update. * import/msvc-inval.h: Update. * import/msvc-nothrow.c: Update. * import/msvc-nothrow.h (if): Update. * import/netinet_in.in.h: Update. * import/open.c (open): Update. (if): Update. * import/openat-die.c: Update. * import/openat-priv.h: Update. * import/openat-proc.c: Update. * import/openat.c (rpl_openat): Update. * import/openat.h: Update. * import/opendir.c: Update. * import/pathmax.h (if): Update. * import/pipe-safer.c: Update. * import/rawmemchr.c: Update. * import/rawmemchr.valgrind: Update. * import/readdir.c (readdir): Update. * import/readlink.c: Update. * import/realloc.c: Update. * import/ref-add.sin: Remove. * import/ref-del.sin: Remove. * import/rename.c (if): Update. * import/rewinddir.c: Update. * import/rmdir.c: Update. * import/same-inode.h (SAME_INODE): Update. * import/save-cwd.c (save_cwd): Update. * import/save-cwd.h: Update. * import/scratch_buffer.h: New file. * import/secure_getenv.c: Remove. * import/setenv.c: Update. * import/signal.in.h: Update. * import/stat-time.c: New file. * import/stat-time.h: New file. * import/stat-w32.c: New file. * import/stat-w32.h: New file. * import/stat.c (if): Update. (stat): Update. (REPLACE_FUNC_STAT_DIR): Update. (WINDOWS_NATIVE): Update. (WIN32_LEAN_AND_MEAN): Update. (is_unc_root): Update. (rpl_stat): Update. * import/stdalign.in.h (elif): Update. * import/stdbool.in.h: Update. * import/stddef.in.h (_GL_STDDEF_ALIGNAS): Update. (max_align_t): Update. (GNULIB_defined_max_align_t): Update. * import/stdint.in.h (WINT_MIN): Update. (WINT_MAX): Update. (_STDINT_MIN): Update. (_STDINT_UNSIGNED_MIN): Update. (_STDINT_SIGNED_MIN): Update. (PTRDIFF_MIN): Update. (SIG_ATOMIC_MIN): Update. (WCHAR_MIN): Update. * import/stdio.in.h (if): Update. * import/stdlib.in.h (if): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_SYS): Update. (random): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (srandom): Update. (initstate): Update. (setstate): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (GNULIB_defined_strtod_function): Update. (strtold): Update. (GNULIB_defined_strtold_function): Update. * import/str-two-way.h: Update. * import/strchrnul.c: Update. * import/strchrnul.valgrind: Update. * import/strdup.c: Update. * import/streq.h: Update. * import/strerror-override.c: Update. * import/strerror-override.h: Update. * import/strerror.c (strerror): Update. * import/strerror_r.c (safe_copy): Update. * import/string.in.h (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/stripslash.c: Update. * import/strnlen1.c: Update. * import/strnlen1.h: Update. * import/strstr.c (__builtin_expect): Update. * import/strtok_r.c: Update. * import/sys_socket.in.h (CMSG_SPACE): Update. (CMSG_LEN): Update. (struct sockaddr_storage): Update. (SO_REUSEPORT): Update. (_GL_WARN_ON_USE): Update. * import/sys_stat.in.h (if): Update. (stat): Update. (struct stat): Update. (st_atime): Update. (st_mtime): Update. (st_ctime): Update. (_GL_WINDOWS_STAT_TIMESPEC): Update. (GNULIB_defined_struct_stat): Update. (_S_IFBLK): Update. (_S_IFLNK): Update. (_S_IFSOCK): Update. (fstat): Update. (fstatat): Update. (lstat): Update. (stat64): Update. (_stat64): Update. (_stat32i64): Update. (_stati64): Update. (_stat32): Update. (_stat64i32): Update. * import/sys_time.in.h: Update. * import/sys_types.in.h (dev_t): Update. (GNULIB_defined_dev_t): Update. (ino_t): Update. (GNULIB_defined_ino_t): Update. (_GL_WINDOWS_STAT_INODES): Update. (if): Update. * import/sys_uio.in.h: Update. * import/tempname.c (__secure_getenv): Update. (try_nocreate): Update. * import/tempname.h: Update. * import/time.in.h (tzset): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (ctime): Update. (strftime): Update. * import/time_r.c: Update. * import/unistd--.h: Update. * import/unistd-safer.h: Update. * import/unistd.in.h (if): Update. (elif): Update. (__need_getopt): Update. (access): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_SYS): Update. (__declspec): Update. (_GL_WARN_ON_USE_ATTRIBUTE): Update. (faccessat): Update. (getpass): Update. (truncate): Update. * import/unsetenv.c: Update. * import/verify.h (if): Update. (_GL_HAVE__STATIC_ASSERT): Update. (_GL_HAVE_STATIC_ASSERT): Update. (_GL_HAVE__STATIC_ASSERT1): Update. (_GL_HAVE_STATIC_ASSERT1): Update. (_GL_VERIFY): Update. (_Static_assert): Update. (_GL_HAS_BUILTIN_TRAP): Update. (_GL_HAS_BUILTIN_UNREACHABLE): Update. (verify_true): Update. (verify): Update. (__has_builtin): Update. (elif): Update. (assume): Update. * import/warn-on-use.h: Rename from import/extra/snippet/warn-on-use.h. * import/wchar.in.h (if): Update. (wcsftime): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. * import/wctype.in.h (rpl_iswalnum): Update. (rpl_iswalpha): Update. (rpl_iswblank): Update. (rpl_iswcntrl): Update. (rpl_iswdigit): Update. (rpl_iswgraph): Update. (rpl_iswlower): Update. (rpl_iswprint): Update. (rpl_iswpunct): Update. (rpl_iswspace): Update. (rpl_iswupper): Update. (rpl_iswxdigit): Update. (rpl_towlower): Update. (rpl_towupper): Update. (iswalnum): Update. (iswalpha): Update. (iswblank): Update. (iswcntrl): Update. (iswdigit): Update. (iswgraph): Update. (iswlower): Update. (iswprint): Update. (iswpunct): Update. (iswspace): Update. (iswupper): Update. (iswxdigit): Update. (towlower): Update. (towupper): Update. * import/windows-initguard.h: New file. * import/windows-mutex.c: New file. * import/windows-mutex.h: New file. * import/windows-once.c: New file. * import/windows-once.h: New file. * import/windows-recmutex.c: New file. * import/windows-recmutex.h: New file. * import/windows-rwlock.c: New file. * import/windows-rwlock.h: New file. * import/xalloc-oversized.h: New file. * patches/0001-Fix-PR-gdb-23558-Use-system-s-getcwd-when-cross-comp.patch: Remove. * patches/0002-mkostemp-mkostemps-Fix-compilation-error-in-C-mode-o.patch: Remove. * patches/0003-Fix-glob-c-Coverity-issues.patch: Remove. * update-gnulib.sh: Update to latest gnulib and don't apply patches anymore. Also updates the patch -p flag to the current directory structure in case patches are needed again in the future. Change-Id: I9c2b07a3046baecfb664e21b2644353ea888dbfa
453 lines
17 KiB
C
453 lines
17 KiB
C
/* Byte-wise substring search, using the Two-Way algorithm.
|
|
Copyright (C) 2008-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Written by Eric Blake <ebb9@byu.net>, 2008.
|
|
|
|
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 <https://www.gnu.org/licenses/>. */
|
|
|
|
/* Before including this file, you need to include <config.h> and
|
|
<string.h>, and define:
|
|
RETURN_TYPE A macro that expands to the return type.
|
|
AVAILABLE(h, h_l, j, n_l)
|
|
A macro that returns nonzero if there are
|
|
at least N_L bytes left starting at H[J].
|
|
H is 'unsigned char *', H_L, J, and N_L
|
|
are 'size_t'; H_L is an lvalue. For
|
|
NUL-terminated searches, H_L can be
|
|
modified each iteration to avoid having
|
|
to compute the end of H up front.
|
|
|
|
For case-insensitivity, you may optionally define:
|
|
CMP_FUNC(p1, p2, l) A macro that returns 0 iff the first L
|
|
characters of P1 and P2 are equal.
|
|
CANON_ELEMENT(c) A macro that canonicalizes an element right after
|
|
it has been fetched from one of the two strings.
|
|
The argument is an 'unsigned char'; the result
|
|
must be an 'unsigned char' as well.
|
|
|
|
This file undefines the macros documented above, and defines
|
|
LONG_NEEDLE_THRESHOLD.
|
|
*/
|
|
|
|
#include <limits.h>
|
|
#include <stdint.h>
|
|
|
|
/* We use the Two-Way string matching algorithm (also known as
|
|
Chrochemore-Perrin), which guarantees linear complexity with
|
|
constant space. Additionally, for long needles, we also use a bad
|
|
character shift table similar to the Boyer-Moore algorithm to
|
|
achieve improved (potentially sub-linear) performance.
|
|
|
|
See https://www-igm.univ-mlv.fr/~lecroq/string/node26.html#SECTION00260,
|
|
https://en.wikipedia.org/wiki/Boyer-Moore_string_search_algorithm,
|
|
https://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.34.6641&rep=rep1&type=pdf
|
|
*/
|
|
|
|
/* Point at which computing a bad-byte shift table is likely to be
|
|
worthwhile. Small needles should not compute a table, since it
|
|
adds (1 << CHAR_BIT) + NEEDLE_LEN computations of preparation for a
|
|
speedup no greater than a factor of NEEDLE_LEN. The larger the
|
|
needle, the better the potential performance gain. On the other
|
|
hand, on non-POSIX systems with CHAR_BIT larger than eight, the
|
|
memory required for the table is prohibitive. */
|
|
#if CHAR_BIT < 10
|
|
# define LONG_NEEDLE_THRESHOLD 32U
|
|
#else
|
|
# define LONG_NEEDLE_THRESHOLD SIZE_MAX
|
|
#endif
|
|
|
|
#ifndef MAX
|
|
# define MAX(a, b) ((a < b) ? (b) : (a))
|
|
#endif
|
|
|
|
#ifndef CANON_ELEMENT
|
|
# define CANON_ELEMENT(c) c
|
|
#endif
|
|
#ifndef CMP_FUNC
|
|
# define CMP_FUNC memcmp
|
|
#endif
|
|
|
|
/* Perform a critical factorization of NEEDLE, of length NEEDLE_LEN.
|
|
Return the index of the first byte in the right half, and set
|
|
*PERIOD to the global period of the right half.
|
|
|
|
The global period of a string is the smallest index (possibly its
|
|
length) at which all remaining bytes in the string are repetitions
|
|
of the prefix (the last repetition may be a subset of the prefix).
|
|
|
|
When NEEDLE is factored into two halves, a local period is the
|
|
length of the smallest word that shares a suffix with the left half
|
|
and shares a prefix with the right half. All factorizations of a
|
|
non-empty NEEDLE have a local period of at least 1 and no greater
|
|
than NEEDLE_LEN.
|
|
|
|
A critical factorization has the property that the local period
|
|
equals the global period. All strings have at least one critical
|
|
factorization with the left half smaller than the global period.
|
|
And while some strings have more than one critical factorization,
|
|
it is provable that with an ordered alphabet, at least one of the
|
|
critical factorizations corresponds to a maximal suffix.
|
|
|
|
Given an ordered alphabet, a critical factorization can be computed
|
|
in linear time, with 2 * NEEDLE_LEN comparisons, by computing the
|
|
shorter of two ordered maximal suffixes. The ordered maximal
|
|
suffixes are determined by lexicographic comparison while tracking
|
|
periodicity. */
|
|
static size_t
|
|
critical_factorization (const unsigned char *needle, size_t needle_len,
|
|
size_t *period)
|
|
{
|
|
/* Index of last byte of left half, or SIZE_MAX. */
|
|
size_t max_suffix, max_suffix_rev;
|
|
size_t j; /* Index into NEEDLE for current candidate suffix. */
|
|
size_t k; /* Offset into current period. */
|
|
size_t p; /* Intermediate period. */
|
|
unsigned char a, b; /* Current comparison bytes. */
|
|
|
|
/* Special case NEEDLE_LEN of 1 or 2 (all callers already filtered
|
|
out 0-length needles. */
|
|
if (needle_len < 3)
|
|
{
|
|
*period = 1;
|
|
return needle_len - 1;
|
|
}
|
|
|
|
/* Invariants:
|
|
0 <= j < NEEDLE_LEN - 1
|
|
-1 <= max_suffix{,_rev} < j (treating SIZE_MAX as if it were signed)
|
|
min(max_suffix, max_suffix_rev) < global period of NEEDLE
|
|
1 <= p <= global period of NEEDLE
|
|
p == global period of the substring NEEDLE[max_suffix{,_rev}+1...j]
|
|
1 <= k <= p
|
|
*/
|
|
|
|
/* Perform lexicographic search. */
|
|
max_suffix = SIZE_MAX;
|
|
j = 0;
|
|
k = p = 1;
|
|
while (j + k < needle_len)
|
|
{
|
|
a = CANON_ELEMENT (needle[j + k]);
|
|
b = CANON_ELEMENT (needle[max_suffix + k]);
|
|
if (a < b)
|
|
{
|
|
/* Suffix is smaller, period is entire prefix so far. */
|
|
j += k;
|
|
k = 1;
|
|
p = j - max_suffix;
|
|
}
|
|
else if (a == b)
|
|
{
|
|
/* Advance through repetition of the current period. */
|
|
if (k != p)
|
|
++k;
|
|
else
|
|
{
|
|
j += p;
|
|
k = 1;
|
|
}
|
|
}
|
|
else /* b < a */
|
|
{
|
|
/* Suffix is larger, start over from current location. */
|
|
max_suffix = j++;
|
|
k = p = 1;
|
|
}
|
|
}
|
|
*period = p;
|
|
|
|
/* Perform reverse lexicographic search. */
|
|
max_suffix_rev = SIZE_MAX;
|
|
j = 0;
|
|
k = p = 1;
|
|
while (j + k < needle_len)
|
|
{
|
|
a = CANON_ELEMENT (needle[j + k]);
|
|
b = CANON_ELEMENT (needle[max_suffix_rev + k]);
|
|
if (b < a)
|
|
{
|
|
/* Suffix is smaller, period is entire prefix so far. */
|
|
j += k;
|
|
k = 1;
|
|
p = j - max_suffix_rev;
|
|
}
|
|
else if (a == b)
|
|
{
|
|
/* Advance through repetition of the current period. */
|
|
if (k != p)
|
|
++k;
|
|
else
|
|
{
|
|
j += p;
|
|
k = 1;
|
|
}
|
|
}
|
|
else /* a < b */
|
|
{
|
|
/* Suffix is larger, start over from current location. */
|
|
max_suffix_rev = j++;
|
|
k = p = 1;
|
|
}
|
|
}
|
|
|
|
/* Choose the shorter suffix. Return the index of the first byte of
|
|
the right half, rather than the last byte of the left half.
|
|
|
|
For some examples, 'banana' has two critical factorizations, both
|
|
exposed by the two lexicographic extreme suffixes of 'anana' and
|
|
'nana', where both suffixes have a period of 2. On the other
|
|
hand, with 'aab' and 'bba', both strings have a single critical
|
|
factorization of the last byte, with the suffix having a period
|
|
of 1. While the maximal lexicographic suffix of 'aab' is 'b',
|
|
the maximal lexicographic suffix of 'bba' is 'ba', which is not a
|
|
critical factorization. Conversely, the maximal reverse
|
|
lexicographic suffix of 'a' works for 'bba', but not 'ab' for
|
|
'aab'. The shorter suffix of the two will always be a critical
|
|
factorization. */
|
|
if (max_suffix_rev + 1 < max_suffix + 1)
|
|
return max_suffix + 1;
|
|
*period = p;
|
|
return max_suffix_rev + 1;
|
|
}
|
|
|
|
/* Return the first location of non-empty NEEDLE within HAYSTACK, or
|
|
NULL. HAYSTACK_LEN is the minimum known length of HAYSTACK. This
|
|
method is optimized for NEEDLE_LEN < LONG_NEEDLE_THRESHOLD.
|
|
Performance is guaranteed to be linear, with an initialization cost
|
|
of 2 * NEEDLE_LEN comparisons.
|
|
|
|
If AVAILABLE does not modify HAYSTACK_LEN (as in memmem), then at
|
|
most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching.
|
|
If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 *
|
|
HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. */
|
|
static RETURN_TYPE
|
|
two_way_short_needle (const unsigned char *haystack, size_t haystack_len,
|
|
const unsigned char *needle, size_t needle_len)
|
|
{
|
|
size_t i; /* Index into current byte of NEEDLE. */
|
|
size_t j; /* Index into current window of HAYSTACK. */
|
|
size_t period; /* The period of the right half of needle. */
|
|
size_t suffix; /* The index of the right half of needle. */
|
|
|
|
/* Factor the needle into two halves, such that the left half is
|
|
smaller than the global period, and the right half is
|
|
periodic (with a period as large as NEEDLE_LEN - suffix). */
|
|
suffix = critical_factorization (needle, needle_len, &period);
|
|
|
|
/* Perform the search. Each iteration compares the right half
|
|
first. */
|
|
if (CMP_FUNC (needle, needle + period, suffix) == 0)
|
|
{
|
|
/* Entire needle is periodic; a mismatch in the left half can
|
|
only advance by the period, so use memory to avoid rescanning
|
|
known occurrences of the period in the right half. */
|
|
size_t memory = 0;
|
|
j = 0;
|
|
while (AVAILABLE (haystack, haystack_len, j, needle_len))
|
|
{
|
|
/* Scan for matches in right half. */
|
|
i = MAX (suffix, memory);
|
|
while (i < needle_len && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
++i;
|
|
if (needle_len <= i)
|
|
{
|
|
/* Scan for matches in left half. */
|
|
i = suffix - 1;
|
|
while (memory < i + 1 && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
--i;
|
|
if (i + 1 < memory + 1)
|
|
return (RETURN_TYPE) (haystack + j);
|
|
/* No match, so remember how many repetitions of period
|
|
on the right half were scanned. */
|
|
j += period;
|
|
memory = needle_len - period;
|
|
}
|
|
else
|
|
{
|
|
j += i - suffix + 1;
|
|
memory = 0;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* The two halves of needle are distinct; no extra memory is
|
|
required, and any mismatch results in a maximal shift. */
|
|
period = MAX (suffix, needle_len - suffix) + 1;
|
|
j = 0;
|
|
while (AVAILABLE (haystack, haystack_len, j, needle_len))
|
|
{
|
|
/* Scan for matches in right half. */
|
|
i = suffix;
|
|
while (i < needle_len && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
++i;
|
|
if (needle_len <= i)
|
|
{
|
|
/* Scan for matches in left half. */
|
|
i = suffix - 1;
|
|
while (i != SIZE_MAX && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
--i;
|
|
if (i == SIZE_MAX)
|
|
return (RETURN_TYPE) (haystack + j);
|
|
j += period;
|
|
}
|
|
else
|
|
j += i - suffix + 1;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the first location of non-empty NEEDLE within HAYSTACK, or
|
|
NULL. HAYSTACK_LEN is the minimum known length of HAYSTACK. This
|
|
method is optimized for LONG_NEEDLE_THRESHOLD <= NEEDLE_LEN.
|
|
Performance is guaranteed to be linear, with an initialization cost
|
|
of 3 * NEEDLE_LEN + (1 << CHAR_BIT) operations.
|
|
|
|
If AVAILABLE does not modify HAYSTACK_LEN (as in memmem), then at
|
|
most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching,
|
|
and sublinear performance O(HAYSTACK_LEN / NEEDLE_LEN) is possible.
|
|
If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 *
|
|
HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching, and
|
|
sublinear performance is not possible. */
|
|
static RETURN_TYPE
|
|
two_way_long_needle (const unsigned char *haystack, size_t haystack_len,
|
|
const unsigned char *needle, size_t needle_len)
|
|
{
|
|
size_t i; /* Index into current byte of NEEDLE. */
|
|
size_t j; /* Index into current window of HAYSTACK. */
|
|
size_t period; /* The period of the right half of needle. */
|
|
size_t suffix; /* The index of the right half of needle. */
|
|
size_t shift_table[1U << CHAR_BIT]; /* See below. */
|
|
|
|
/* Factor the needle into two halves, such that the left half is
|
|
smaller than the global period, and the right half is
|
|
periodic (with a period as large as NEEDLE_LEN - suffix). */
|
|
suffix = critical_factorization (needle, needle_len, &period);
|
|
|
|
/* Populate shift_table. For each possible byte value c,
|
|
shift_table[c] is the distance from the last occurrence of c to
|
|
the end of NEEDLE, or NEEDLE_LEN if c is absent from the NEEDLE.
|
|
shift_table[NEEDLE[NEEDLE_LEN - 1]] contains the only 0. */
|
|
for (i = 0; i < 1U << CHAR_BIT; i++)
|
|
shift_table[i] = needle_len;
|
|
for (i = 0; i < needle_len; i++)
|
|
shift_table[CANON_ELEMENT (needle[i])] = needle_len - i - 1;
|
|
|
|
/* Perform the search. Each iteration compares the right half
|
|
first. */
|
|
if (CMP_FUNC (needle, needle + period, suffix) == 0)
|
|
{
|
|
/* Entire needle is periodic; a mismatch in the left half can
|
|
only advance by the period, so use memory to avoid rescanning
|
|
known occurrences of the period in the right half. */
|
|
size_t memory = 0;
|
|
size_t shift;
|
|
j = 0;
|
|
while (AVAILABLE (haystack, haystack_len, j, needle_len))
|
|
{
|
|
/* Check the last byte first; if it does not match, then
|
|
shift to the next possible match location. */
|
|
shift = shift_table[CANON_ELEMENT (haystack[j + needle_len - 1])];
|
|
if (0 < shift)
|
|
{
|
|
if (memory && shift < period)
|
|
{
|
|
/* Since needle is periodic, but the last period has
|
|
a byte out of place, there can be no match until
|
|
after the mismatch. */
|
|
shift = needle_len - period;
|
|
}
|
|
memory = 0;
|
|
j += shift;
|
|
continue;
|
|
}
|
|
/* Scan for matches in right half. The last byte has
|
|
already been matched, by virtue of the shift table. */
|
|
i = MAX (suffix, memory);
|
|
while (i < needle_len - 1 && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
++i;
|
|
if (needle_len - 1 <= i)
|
|
{
|
|
/* Scan for matches in left half. */
|
|
i = suffix - 1;
|
|
while (memory < i + 1 && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
--i;
|
|
if (i + 1 < memory + 1)
|
|
return (RETURN_TYPE) (haystack + j);
|
|
/* No match, so remember how many repetitions of period
|
|
on the right half were scanned. */
|
|
j += period;
|
|
memory = needle_len - period;
|
|
}
|
|
else
|
|
{
|
|
j += i - suffix + 1;
|
|
memory = 0;
|
|
}
|
|
}
|
|
}
|
|
else
|
|
{
|
|
/* The two halves of needle are distinct; no extra memory is
|
|
required, and any mismatch results in a maximal shift. */
|
|
size_t shift;
|
|
period = MAX (suffix, needle_len - suffix) + 1;
|
|
j = 0;
|
|
while (AVAILABLE (haystack, haystack_len, j, needle_len))
|
|
{
|
|
/* Check the last byte first; if it does not match, then
|
|
shift to the next possible match location. */
|
|
shift = shift_table[CANON_ELEMENT (haystack[j + needle_len - 1])];
|
|
if (0 < shift)
|
|
{
|
|
j += shift;
|
|
continue;
|
|
}
|
|
/* Scan for matches in right half. The last byte has
|
|
already been matched, by virtue of the shift table. */
|
|
i = suffix;
|
|
while (i < needle_len - 1 && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
++i;
|
|
if (needle_len - 1 <= i)
|
|
{
|
|
/* Scan for matches in left half. */
|
|
i = suffix - 1;
|
|
while (i != SIZE_MAX && (CANON_ELEMENT (needle[i])
|
|
== CANON_ELEMENT (haystack[i + j])))
|
|
--i;
|
|
if (i == SIZE_MAX)
|
|
return (RETURN_TYPE) (haystack + j);
|
|
j += period;
|
|
}
|
|
else
|
|
j += i - suffix + 1;
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
#undef AVAILABLE
|
|
#undef CANON_ELEMENT
|
|
#undef CMP_FUNC
|
|
#undef MAX
|
|
#undef RETURN_TYPE
|