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
1218 lines
45 KiB
C
1218 lines
45 KiB
C
/* Copyright (C) 1991-1993, 1996-2006, 2009-2019 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 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/>. */
|
|
|
|
/* Match STRING against the file name pattern PATTERN, returning zero if
|
|
it matches, nonzero if not. */
|
|
static int EXT (INT opt, const CHAR *pattern, const CHAR *string,
|
|
const CHAR *string_end, bool no_leading_period, int flags)
|
|
internal_function;
|
|
static const CHAR *END (const CHAR *patternp) internal_function;
|
|
|
|
static int
|
|
internal_function
|
|
FCT (const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|
bool no_leading_period, int flags)
|
|
{
|
|
register const CHAR *p = pattern, *n = string;
|
|
register UCHAR c;
|
|
#ifdef _LIBC
|
|
# if WIDE_CHAR_VERSION
|
|
const char *collseq = (const char *)
|
|
_NL_CURRENT(LC_COLLATE, _NL_COLLATE_COLLSEQWC);
|
|
# else
|
|
const UCHAR *collseq = (const UCHAR *)
|
|
_NL_CURRENT(LC_COLLATE, _NL_COLLATE_COLLSEQMB);
|
|
# endif
|
|
#endif
|
|
|
|
while ((c = *p++) != L_('\0'))
|
|
{
|
|
bool new_no_leading_period = false;
|
|
c = FOLD (c);
|
|
|
|
switch (c)
|
|
{
|
|
case L_('?'):
|
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
|
{
|
|
int res;
|
|
|
|
res = EXT (c, p, n, string_end, no_leading_period,
|
|
flags);
|
|
if (res != -1)
|
|
return res;
|
|
}
|
|
|
|
if (n == string_end)
|
|
return FNM_NOMATCH;
|
|
else if (*n == L_('/') && (flags & FNM_FILE_NAME))
|
|
return FNM_NOMATCH;
|
|
else if (*n == L_('.') && no_leading_period)
|
|
return FNM_NOMATCH;
|
|
break;
|
|
|
|
case L_('\\'):
|
|
if (!(flags & FNM_NOESCAPE))
|
|
{
|
|
c = *p++;
|
|
if (c == L_('\0'))
|
|
/* Trailing \ loses. */
|
|
return FNM_NOMATCH;
|
|
c = FOLD (c);
|
|
}
|
|
if (n == string_end || FOLD ((UCHAR) *n) != c)
|
|
return FNM_NOMATCH;
|
|
break;
|
|
|
|
case L_('*'):
|
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
|
{
|
|
int res;
|
|
|
|
res = EXT (c, p, n, string_end, no_leading_period,
|
|
flags);
|
|
if (res != -1)
|
|
return res;
|
|
}
|
|
|
|
if (n != string_end && *n == L_('.') && no_leading_period)
|
|
return FNM_NOMATCH;
|
|
|
|
for (c = *p++; c == L_('?') || c == L_('*'); c = *p++)
|
|
{
|
|
if (*p == L_('(') && (flags & FNM_EXTMATCH) != 0)
|
|
{
|
|
const CHAR *endp = END (p);
|
|
if (endp != p)
|
|
{
|
|
/* This is a pattern. Skip over it. */
|
|
p = endp;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (c == L_('?'))
|
|
{
|
|
/* A ? needs to match one character. */
|
|
if (n == string_end)
|
|
/* There isn't another character; no match. */
|
|
return FNM_NOMATCH;
|
|
else if (*n == L_('/')
|
|
&& __builtin_expect (flags & FNM_FILE_NAME, 0))
|
|
/* A slash does not match a wildcard under
|
|
FNM_FILE_NAME. */
|
|
return FNM_NOMATCH;
|
|
else
|
|
/* One character of the string is consumed in matching
|
|
this ? wildcard, so *??? won't match if there are
|
|
less than three characters. */
|
|
++n;
|
|
}
|
|
}
|
|
|
|
if (c == L_('\0'))
|
|
/* The wildcard(s) is/are the last element of the pattern.
|
|
If the name is a file name and contains another slash
|
|
this means it cannot match, unless the FNM_LEADING_DIR
|
|
flag is set. */
|
|
{
|
|
int result = (flags & FNM_FILE_NAME) == 0 ? 0 : FNM_NOMATCH;
|
|
|
|
if (flags & FNM_FILE_NAME)
|
|
{
|
|
if (flags & FNM_LEADING_DIR)
|
|
result = 0;
|
|
else
|
|
{
|
|
if (MEMCHR (n, L_('/'), string_end - n) == NULL)
|
|
result = 0;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
else
|
|
{
|
|
const CHAR *endp;
|
|
|
|
endp = MEMCHR (n, (flags & FNM_FILE_NAME) ? L_('/') : L_('\0'),
|
|
string_end - n);
|
|
if (endp == NULL)
|
|
endp = string_end;
|
|
|
|
if (c == L_('[')
|
|
|| (__builtin_expect (flags & FNM_EXTMATCH, 0) != 0
|
|
&& (c == L_('@') || c == L_('+') || c == L_('!'))
|
|
&& *p == L_('(')))
|
|
{
|
|
int flags2 = ((flags & FNM_FILE_NAME)
|
|
? flags : (flags & ~FNM_PERIOD));
|
|
bool no_leading_period2 = no_leading_period;
|
|
|
|
for (--p; n < endp; ++n, no_leading_period2 = false)
|
|
if (FCT (p, n, string_end, no_leading_period2, flags2)
|
|
== 0)
|
|
return 0;
|
|
}
|
|
else if (c == L_('/') && (flags & FNM_FILE_NAME))
|
|
{
|
|
while (n < string_end && *n != L_('/'))
|
|
++n;
|
|
if (n < string_end && *n == L_('/')
|
|
&& (FCT (p, n + 1, string_end, flags & FNM_PERIOD, flags)
|
|
== 0))
|
|
return 0;
|
|
}
|
|
else
|
|
{
|
|
int flags2 = ((flags & FNM_FILE_NAME)
|
|
? flags : (flags & ~FNM_PERIOD));
|
|
int no_leading_period2 = no_leading_period;
|
|
|
|
if (c == L_('\\') && !(flags & FNM_NOESCAPE))
|
|
c = *p;
|
|
c = FOLD (c);
|
|
for (--p; n < endp; ++n, no_leading_period2 = false)
|
|
if (FOLD ((UCHAR) *n) == c
|
|
&& (FCT (p, n, string_end, no_leading_period2, flags2)
|
|
== 0))
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
/* If we come here no match is possible with the wildcard. */
|
|
return FNM_NOMATCH;
|
|
|
|
case L_('['):
|
|
{
|
|
/* Nonzero if the sense of the character class is inverted. */
|
|
const CHAR *p_init = p;
|
|
const CHAR *n_init = n;
|
|
register bool not;
|
|
CHAR cold;
|
|
UCHAR fn;
|
|
|
|
if (posixly_correct == 0)
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
if (n == string_end)
|
|
return FNM_NOMATCH;
|
|
|
|
if (*n == L_('.') && no_leading_period)
|
|
return FNM_NOMATCH;
|
|
|
|
if (*n == L_('/') && (flags & FNM_FILE_NAME))
|
|
/* '/' cannot be matched. */
|
|
return FNM_NOMATCH;
|
|
|
|
not = (*p == L_('!') || (posixly_correct < 0 && *p == L_('^')));
|
|
if (not)
|
|
++p;
|
|
|
|
fn = FOLD ((UCHAR) *n);
|
|
|
|
c = *p++;
|
|
for (;;)
|
|
{
|
|
bool is_range = false;
|
|
|
|
if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
|
|
{
|
|
if (*p == L_('\0'))
|
|
return FNM_NOMATCH;
|
|
c = FOLD ((UCHAR) *p);
|
|
++p;
|
|
|
|
goto normal_bracket;
|
|
}
|
|
else if (c == L_('[') && *p == L_(':'))
|
|
{
|
|
/* Leave room for the null. */
|
|
CHAR str[CHAR_CLASS_MAX_LENGTH + 1];
|
|
size_t c1 = 0;
|
|
#if defined _LIBC || WIDE_CHAR_SUPPORT
|
|
wctype_t wt;
|
|
#endif
|
|
const CHAR *startp = p;
|
|
|
|
for (;;)
|
|
{
|
|
if (c1 == CHAR_CLASS_MAX_LENGTH)
|
|
/* The name is too long and therefore the pattern
|
|
is ill-formed. */
|
|
return FNM_NOMATCH;
|
|
|
|
c = *++p;
|
|
if (c == L_(':') && p[1] == L_(']'))
|
|
{
|
|
p += 2;
|
|
break;
|
|
}
|
|
if (c < L_('a') || c >= L_('z'))
|
|
{
|
|
/* This cannot possibly be a character class name.
|
|
Match it as a normal range. */
|
|
p = startp;
|
|
c = L_('[');
|
|
goto normal_bracket;
|
|
}
|
|
str[c1++] = c;
|
|
}
|
|
str[c1] = L_('\0');
|
|
|
|
#if defined _LIBC || WIDE_CHAR_SUPPORT
|
|
wt = IS_CHAR_CLASS (str);
|
|
if (wt == 0)
|
|
/* Invalid character class name. */
|
|
return FNM_NOMATCH;
|
|
|
|
# if defined _LIBC && ! WIDE_CHAR_VERSION
|
|
/* The following code is glibc specific but does
|
|
there a good job in speeding up the code since
|
|
we can avoid the btowc() call. */
|
|
if (_ISCTYPE ((UCHAR) *n, wt))
|
|
goto matched;
|
|
# else
|
|
if (ISWCTYPE (BTOWC ((UCHAR) *n), wt))
|
|
goto matched;
|
|
# endif
|
|
#else
|
|
if ((STREQ (str, L_("alnum")) && isalnum ((UCHAR) *n))
|
|
|| (STREQ (str, L_("alpha")) && isalpha ((UCHAR) *n))
|
|
|| (STREQ (str, L_("blank")) && isblank ((UCHAR) *n))
|
|
|| (STREQ (str, L_("cntrl")) && iscntrl ((UCHAR) *n))
|
|
|| (STREQ (str, L_("digit")) && isdigit ((UCHAR) *n))
|
|
|| (STREQ (str, L_("graph")) && isgraph ((UCHAR) *n))
|
|
|| (STREQ (str, L_("lower")) && islower ((UCHAR) *n))
|
|
|| (STREQ (str, L_("print")) && isprint ((UCHAR) *n))
|
|
|| (STREQ (str, L_("punct")) && ispunct ((UCHAR) *n))
|
|
|| (STREQ (str, L_("space")) && isspace ((UCHAR) *n))
|
|
|| (STREQ (str, L_("upper")) && isupper ((UCHAR) *n))
|
|
|| (STREQ (str, L_("xdigit")) && isxdigit ((UCHAR) *n)))
|
|
goto matched;
|
|
#endif
|
|
c = *p++;
|
|
}
|
|
#ifdef _LIBC
|
|
else if (c == L_('[') && *p == L_('='))
|
|
{
|
|
UCHAR str[1];
|
|
uint32_t nrules =
|
|
_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
const CHAR *startp = p;
|
|
|
|
c = *++p;
|
|
if (c == L_('\0'))
|
|
{
|
|
p = startp;
|
|
c = L_('[');
|
|
goto normal_bracket;
|
|
}
|
|
str[0] = c;
|
|
|
|
c = *++p;
|
|
if (c != L_('=') || p[1] != L_(']'))
|
|
{
|
|
p = startp;
|
|
c = L_('[');
|
|
goto normal_bracket;
|
|
}
|
|
p += 2;
|
|
|
|
if (nrules == 0)
|
|
{
|
|
if ((UCHAR) *n == str[0])
|
|
goto matched;
|
|
}
|
|
else
|
|
{
|
|
const int32_t *table;
|
|
# if WIDE_CHAR_VERSION
|
|
const int32_t *weights;
|
|
const int32_t *extra;
|
|
# else
|
|
const unsigned char *weights;
|
|
const unsigned char *extra;
|
|
# endif
|
|
const int32_t *indirect;
|
|
int32_t idx;
|
|
const UCHAR *cp = (const UCHAR *) str;
|
|
|
|
/* This #include defines a local function! */
|
|
# if WIDE_CHAR_VERSION
|
|
# include <locale/weightwc.h>
|
|
# else
|
|
# include <locale/weight.h>
|
|
# endif
|
|
|
|
# if WIDE_CHAR_VERSION
|
|
table = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEWC);
|
|
weights = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTWC);
|
|
extra = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAWC);
|
|
indirect = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTWC);
|
|
# else
|
|
table = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
|
|
weights = (const unsigned char *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_WEIGHTMB);
|
|
extra = (const unsigned char *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
|
|
indirect = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
|
|
# endif
|
|
|
|
idx = findidx (&cp);
|
|
if (idx != 0)
|
|
{
|
|
/* We found a table entry. Now see whether the
|
|
character we are currently at has the same
|
|
equivalence class value. */
|
|
int len = weights[idx & 0xffffff];
|
|
int32_t idx2;
|
|
const UCHAR *np = (const UCHAR *) n;
|
|
|
|
idx2 = findidx (&np);
|
|
if (idx2 != 0
|
|
&& (idx >> 24) == (idx2 >> 24)
|
|
&& len == weights[idx2 & 0xffffff])
|
|
{
|
|
int cnt = 0;
|
|
|
|
idx &= 0xffffff;
|
|
idx2 &= 0xffffff;
|
|
|
|
while (cnt < len
|
|
&& (weights[idx + 1 + cnt]
|
|
== weights[idx2 + 1 + cnt]))
|
|
++cnt;
|
|
|
|
if (cnt == len)
|
|
goto matched;
|
|
}
|
|
}
|
|
}
|
|
|
|
c = *p++;
|
|
}
|
|
#endif
|
|
else if (c == L_('\0'))
|
|
{
|
|
/* [ unterminated, treat as normal character. */
|
|
p = p_init;
|
|
n = n_init;
|
|
c = L_('[');
|
|
goto normal_match;
|
|
}
|
|
else
|
|
{
|
|
#ifdef _LIBC
|
|
bool is_seqval = false;
|
|
|
|
if (c == L_('[') && *p == L_('.'))
|
|
{
|
|
uint32_t nrules =
|
|
_NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
|
|
const CHAR *startp = p;
|
|
size_t c1 = 0;
|
|
|
|
while (1)
|
|
{
|
|
c = *++p;
|
|
if (c == L_('.') && p[1] == L_(']'))
|
|
{
|
|
p += 2;
|
|
break;
|
|
}
|
|
if (c == '\0')
|
|
return FNM_NOMATCH;
|
|
++c1;
|
|
}
|
|
|
|
/* We have to handling the symbols differently in
|
|
ranges since then the collation sequence is
|
|
important. */
|
|
is_range = *p == L_('-') && p[1] != L_('\0');
|
|
|
|
if (nrules == 0)
|
|
{
|
|
/* There are no names defined in the collation
|
|
data. Therefore we only accept the trivial
|
|
names consisting of the character itself. */
|
|
if (c1 != 1)
|
|
return FNM_NOMATCH;
|
|
|
|
if (!is_range && *n == startp[1])
|
|
goto matched;
|
|
|
|
cold = startp[1];
|
|
c = *p++;
|
|
}
|
|
else
|
|
{
|
|
int32_t table_size;
|
|
const int32_t *symb_table;
|
|
# ifdef WIDE_CHAR_VERSION
|
|
char str[c1];
|
|
size_t strcnt;
|
|
# else
|
|
# define str (startp + 1)
|
|
# endif
|
|
const unsigned char *extra;
|
|
int32_t idx;
|
|
int32_t elem;
|
|
int32_t second;
|
|
int32_t hash;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
/* We have to convert the name to a single-byte
|
|
string. This is possible since the names
|
|
consist of ASCII characters and the internal
|
|
representation is UCS4. */
|
|
for (strcnt = 0; strcnt < c1; ++strcnt)
|
|
str[strcnt] = startp[1 + strcnt];
|
|
# endif
|
|
|
|
table_size =
|
|
_NL_CURRENT_WORD (LC_COLLATE,
|
|
_NL_COLLATE_SYMB_HASH_SIZEMB);
|
|
symb_table = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE,
|
|
_NL_COLLATE_SYMB_TABLEMB);
|
|
extra = (const unsigned char *)
|
|
_NL_CURRENT (LC_COLLATE,
|
|
_NL_COLLATE_SYMB_EXTRAMB);
|
|
|
|
/* Locate the character in the hashing table. */
|
|
hash = elem_hash (str, c1);
|
|
|
|
idx = 0;
|
|
elem = hash % table_size;
|
|
if (symb_table[2 * elem] != 0)
|
|
{
|
|
second = hash % (table_size - 2) + 1;
|
|
|
|
do
|
|
{
|
|
/* First compare the hashing value. */
|
|
if (symb_table[2 * elem] == hash
|
|
&& (c1
|
|
== extra[symb_table[2 * elem + 1]])
|
|
&& memcmp (str,
|
|
&extra[symb_table[2 * elem
|
|
+ 1]
|
|
+ 1], c1) == 0)
|
|
{
|
|
/* Yep, this is the entry. */
|
|
idx = symb_table[2 * elem + 1];
|
|
idx += 1 + extra[idx];
|
|
break;
|
|
}
|
|
|
|
/* Next entry. */
|
|
elem += second;
|
|
}
|
|
while (symb_table[2 * elem] != 0);
|
|
}
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
{
|
|
/* Compare the byte sequence but only if
|
|
this is not part of a range. */
|
|
# ifdef WIDE_CHAR_VERSION
|
|
int32_t *wextra;
|
|
|
|
idx += 1 + extra[idx];
|
|
/* Adjust for the alignment. */
|
|
idx = (idx + 3) & ~3;
|
|
|
|
wextra = (int32_t *) &extra[idx + 4];
|
|
# endif
|
|
|
|
if (! is_range)
|
|
{
|
|
# ifdef WIDE_CHAR_VERSION
|
|
for (c1 = 0;
|
|
(int32_t) c1 < wextra[idx];
|
|
++c1)
|
|
if (n[c1] != wextra[1 + c1])
|
|
break;
|
|
|
|
if ((int32_t) c1 == wextra[idx])
|
|
goto matched;
|
|
# else
|
|
for (c1 = 0; c1 < extra[idx]; ++c1)
|
|
if (n[c1] != extra[1 + c1])
|
|
break;
|
|
|
|
if (c1 == extra[idx])
|
|
goto matched;
|
|
# endif
|
|
}
|
|
|
|
/* Get the collation sequence value. */
|
|
is_seqval = true;
|
|
# ifdef WIDE_CHAR_VERSION
|
|
cold = wextra[1 + wextra[idx]];
|
|
# else
|
|
/* Adjust for the alignment. */
|
|
idx += 1 + extra[idx];
|
|
idx = (idx + 3) & ~4;
|
|
cold = *((int32_t *) &extra[idx]);
|
|
# endif
|
|
|
|
c = *p++;
|
|
}
|
|
else if (c1 == 1)
|
|
{
|
|
/* No valid character. Match it as a
|
|
single byte. */
|
|
if (!is_range && *n == str[0])
|
|
goto matched;
|
|
|
|
cold = str[0];
|
|
c = *p++;
|
|
}
|
|
else
|
|
return FNM_NOMATCH;
|
|
}
|
|
}
|
|
else
|
|
# undef str
|
|
#endif
|
|
{
|
|
c = FOLD (c);
|
|
normal_bracket:
|
|
|
|
/* We have to handling the symbols differently in
|
|
ranges since then the collation sequence is
|
|
important. */
|
|
is_range = (*p == L_('-') && p[1] != L_('\0')
|
|
&& p[1] != L_(']'));
|
|
|
|
if (!is_range && c == fn)
|
|
goto matched;
|
|
|
|
#if _LIBC
|
|
/* This is needed if we goto normal_bracket; from
|
|
outside of is_seqval's scope. */
|
|
is_seqval = false;
|
|
#endif
|
|
|
|
cold = c;
|
|
c = *p++;
|
|
}
|
|
|
|
if (c == L_('-') && *p != L_(']'))
|
|
{
|
|
#if _LIBC
|
|
/* We have to find the collation sequence
|
|
value for C. Collation sequence is nothing
|
|
we can regularly access. The sequence
|
|
value is defined by the order in which the
|
|
definitions of the collation values for the
|
|
various characters appear in the source
|
|
file. A strange concept, nowhere
|
|
documented. */
|
|
uint32_t fcollseq;
|
|
uint32_t lcollseq;
|
|
UCHAR cend = *p++;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
/* Search in the 'names' array for the characters. */
|
|
fcollseq = __collseq_table_lookup (collseq, fn);
|
|
if (fcollseq == ~((uint32_t) 0))
|
|
/* XXX We don't know anything about the character
|
|
we are supposed to match. This means we are
|
|
failing. */
|
|
goto range_not_matched;
|
|
|
|
if (is_seqval)
|
|
lcollseq = cold;
|
|
else
|
|
lcollseq = __collseq_table_lookup (collseq, cold);
|
|
# else
|
|
fcollseq = collseq[fn];
|
|
lcollseq = is_seqval ? cold : collseq[(UCHAR) cold];
|
|
# endif
|
|
|
|
is_seqval = false;
|
|
if (cend == L_('[') && *p == L_('.'))
|
|
{
|
|
uint32_t nrules =
|
|
_NL_CURRENT_WORD (LC_COLLATE,
|
|
_NL_COLLATE_NRULES);
|
|
const CHAR *startp = p;
|
|
size_t c1 = 0;
|
|
|
|
while (1)
|
|
{
|
|
c = *++p;
|
|
if (c == L_('.') && p[1] == L_(']'))
|
|
{
|
|
p += 2;
|
|
break;
|
|
}
|
|
if (c == '\0')
|
|
return FNM_NOMATCH;
|
|
++c1;
|
|
}
|
|
|
|
if (nrules == 0)
|
|
{
|
|
/* There are no names defined in the
|
|
collation data. Therefore we only
|
|
accept the trivial names consisting
|
|
of the character itself. */
|
|
if (c1 != 1)
|
|
return FNM_NOMATCH;
|
|
|
|
cend = startp[1];
|
|
}
|
|
else
|
|
{
|
|
int32_t table_size;
|
|
const int32_t *symb_table;
|
|
# ifdef WIDE_CHAR_VERSION
|
|
char str[c1];
|
|
size_t strcnt;
|
|
# else
|
|
# define str (startp + 1)
|
|
# endif
|
|
const unsigned char *extra;
|
|
int32_t idx;
|
|
int32_t elem;
|
|
int32_t second;
|
|
int32_t hash;
|
|
|
|
# ifdef WIDE_CHAR_VERSION
|
|
/* We have to convert the name to a single-byte
|
|
string. This is possible since the names
|
|
consist of ASCII characters and the internal
|
|
representation is UCS4. */
|
|
for (strcnt = 0; strcnt < c1; ++strcnt)
|
|
str[strcnt] = startp[1 + strcnt];
|
|
# endif
|
|
|
|
table_size =
|
|
_NL_CURRENT_WORD (LC_COLLATE,
|
|
_NL_COLLATE_SYMB_HASH_SIZEMB);
|
|
symb_table = (const int32_t *)
|
|
_NL_CURRENT (LC_COLLATE,
|
|
_NL_COLLATE_SYMB_TABLEMB);
|
|
extra = (const unsigned char *)
|
|
_NL_CURRENT (LC_COLLATE,
|
|
_NL_COLLATE_SYMB_EXTRAMB);
|
|
|
|
/* Locate the character in the hashing
|
|
table. */
|
|
hash = elem_hash (str, c1);
|
|
|
|
idx = 0;
|
|
elem = hash % table_size;
|
|
if (symb_table[2 * elem] != 0)
|
|
{
|
|
second = hash % (table_size - 2) + 1;
|
|
|
|
do
|
|
{
|
|
/* First compare the hashing value. */
|
|
if (symb_table[2 * elem] == hash
|
|
&& (c1
|
|
== extra[symb_table[2 * elem + 1]])
|
|
&& memcmp (str,
|
|
&extra[symb_table[2 * elem + 1]
|
|
+ 1], c1) == 0)
|
|
{
|
|
/* Yep, this is the entry. */
|
|
idx = symb_table[2 * elem + 1];
|
|
idx += 1 + extra[idx];
|
|
break;
|
|
}
|
|
|
|
/* Next entry. */
|
|
elem += second;
|
|
}
|
|
while (symb_table[2 * elem] != 0);
|
|
}
|
|
|
|
if (symb_table[2 * elem] != 0)
|
|
{
|
|
/* Compare the byte sequence but only if
|
|
this is not part of a range. */
|
|
# ifdef WIDE_CHAR_VERSION
|
|
int32_t *wextra;
|
|
|
|
idx += 1 + extra[idx];
|
|
/* Adjust for the alignment. */
|
|
idx = (idx + 3) & ~4;
|
|
|
|
wextra = (int32_t *) &extra[idx + 4];
|
|
# endif
|
|
/* Get the collation sequence value. */
|
|
is_seqval = true;
|
|
# ifdef WIDE_CHAR_VERSION
|
|
cend = wextra[1 + wextra[idx]];
|
|
# else
|
|
/* Adjust for the alignment. */
|
|
idx += 1 + extra[idx];
|
|
idx = (idx + 3) & ~4;
|
|
cend = *((int32_t *) &extra[idx]);
|
|
# endif
|
|
}
|
|
else if (symb_table[2 * elem] != 0 && c1 == 1)
|
|
{
|
|
cend = str[0];
|
|
c = *p++;
|
|
}
|
|
else
|
|
return FNM_NOMATCH;
|
|
}
|
|
# undef str
|
|
}
|
|
else
|
|
{
|
|
if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
|
|
cend = *p++;
|
|
if (cend == L_('\0'))
|
|
return FNM_NOMATCH;
|
|
cend = FOLD (cend);
|
|
}
|
|
|
|
/* XXX It is not entirely clear to me how to handle
|
|
characters which are not mentioned in the
|
|
collation specification. */
|
|
if (
|
|
# ifdef WIDE_CHAR_VERSION
|
|
lcollseq == 0xffffffff ||
|
|
# endif
|
|
lcollseq <= fcollseq)
|
|
{
|
|
/* We have to look at the upper bound. */
|
|
uint32_t hcollseq;
|
|
|
|
if (is_seqval)
|
|
hcollseq = cend;
|
|
else
|
|
{
|
|
# ifdef WIDE_CHAR_VERSION
|
|
hcollseq =
|
|
__collseq_table_lookup (collseq, cend);
|
|
if (hcollseq == ~((uint32_t) 0))
|
|
{
|
|
/* Hum, no information about the upper
|
|
bound. The matching succeeds if the
|
|
lower bound is matched exactly. */
|
|
if (lcollseq != fcollseq)
|
|
goto range_not_matched;
|
|
|
|
goto matched;
|
|
}
|
|
# else
|
|
hcollseq = collseq[cend];
|
|
# endif
|
|
}
|
|
|
|
if (lcollseq <= hcollseq && fcollseq <= hcollseq)
|
|
goto matched;
|
|
}
|
|
# ifdef WIDE_CHAR_VERSION
|
|
range_not_matched:
|
|
# endif
|
|
#else
|
|
/* We use a boring value comparison of the character
|
|
values. This is better than comparing using
|
|
'strcoll' since the latter would have surprising
|
|
and sometimes fatal consequences. */
|
|
UCHAR cend = *p++;
|
|
|
|
if (!(flags & FNM_NOESCAPE) && cend == L_('\\'))
|
|
cend = *p++;
|
|
if (cend == L_('\0'))
|
|
return FNM_NOMATCH;
|
|
|
|
/* It is a range. */
|
|
if (cold <= fn && fn <= cend)
|
|
goto matched;
|
|
#endif
|
|
|
|
c = *p++;
|
|
}
|
|
}
|
|
|
|
if (c == L_(']'))
|
|
break;
|
|
}
|
|
|
|
if (!not)
|
|
return FNM_NOMATCH;
|
|
break;
|
|
|
|
matched:
|
|
/* Skip the rest of the [...] that already matched. */
|
|
do
|
|
{
|
|
ignore_next:
|
|
c = *p++;
|
|
|
|
if (c == L_('\0'))
|
|
/* [... (unterminated) loses. */
|
|
return FNM_NOMATCH;
|
|
|
|
if (!(flags & FNM_NOESCAPE) && c == L_('\\'))
|
|
{
|
|
if (*p == L_('\0'))
|
|
return FNM_NOMATCH;
|
|
/* XXX 1003.2d11 is unclear if this is right. */
|
|
++p;
|
|
}
|
|
else if (c == L_('[') && *p == L_(':'))
|
|
{
|
|
int c1 = 0;
|
|
const CHAR *startp = p;
|
|
|
|
while (1)
|
|
{
|
|
c = *++p;
|
|
if (++c1 == CHAR_CLASS_MAX_LENGTH)
|
|
return FNM_NOMATCH;
|
|
|
|
if (*p == L_(':') && p[1] == L_(']'))
|
|
break;
|
|
|
|
if (c < L_('a') || c >= L_('z'))
|
|
{
|
|
p = startp;
|
|
goto ignore_next;
|
|
}
|
|
}
|
|
p += 2;
|
|
c = *p++;
|
|
}
|
|
else if (c == L_('[') && *p == L_('='))
|
|
{
|
|
c = *++p;
|
|
if (c == L_('\0'))
|
|
return FNM_NOMATCH;
|
|
c = *++p;
|
|
if (c != L_('=') || p[1] != L_(']'))
|
|
return FNM_NOMATCH;
|
|
p += 2;
|
|
c = *p++;
|
|
}
|
|
else if (c == L_('[') && *p == L_('.'))
|
|
{
|
|
++p;
|
|
while (1)
|
|
{
|
|
c = *++p;
|
|
if (c == '\0')
|
|
return FNM_NOMATCH;
|
|
|
|
if (*p == L_('.') && p[1] == L_(']'))
|
|
break;
|
|
}
|
|
p += 2;
|
|
c = *p++;
|
|
}
|
|
}
|
|
while (c != L_(']'));
|
|
if (not)
|
|
return FNM_NOMATCH;
|
|
}
|
|
break;
|
|
|
|
case L_('+'):
|
|
case L_('@'):
|
|
case L_('!'):
|
|
if (__builtin_expect (flags & FNM_EXTMATCH, 0) && *p == '(')
|
|
{
|
|
int res;
|
|
|
|
res = EXT (c, p, n, string_end, no_leading_period, flags);
|
|
if (res != -1)
|
|
return res;
|
|
}
|
|
goto normal_match;
|
|
|
|
case L_('/'):
|
|
if (NO_LEADING_PERIOD (flags))
|
|
{
|
|
if (n == string_end || c != (UCHAR) *n)
|
|
return FNM_NOMATCH;
|
|
|
|
new_no_leading_period = true;
|
|
break;
|
|
}
|
|
FALLTHROUGH;
|
|
default:
|
|
normal_match:
|
|
if (n == string_end || c != FOLD ((UCHAR) *n))
|
|
return FNM_NOMATCH;
|
|
}
|
|
|
|
no_leading_period = new_no_leading_period;
|
|
++n;
|
|
}
|
|
|
|
if (n == string_end)
|
|
return 0;
|
|
|
|
if ((flags & FNM_LEADING_DIR) && n != string_end && *n == L_('/'))
|
|
/* The FNM_LEADING_DIR flag says that "foo*" matches "foobar/frobozz". */
|
|
return 0;
|
|
|
|
return FNM_NOMATCH;
|
|
}
|
|
|
|
|
|
static const CHAR *
|
|
internal_function
|
|
END (const CHAR *pattern)
|
|
{
|
|
const CHAR *p = pattern;
|
|
|
|
while (1)
|
|
if (*++p == L_('\0'))
|
|
/* This is an invalid pattern. */
|
|
return pattern;
|
|
else if (*p == L_('['))
|
|
{
|
|
/* Handle brackets special. */
|
|
if (posixly_correct == 0)
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
/* Skip the not sign. We have to recognize it because of a possibly
|
|
following ']'. */
|
|
if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
|
|
++p;
|
|
/* A leading ']' is recognized as such. */
|
|
if (*p == L_(']'))
|
|
++p;
|
|
/* Skip over all characters of the list. */
|
|
while (*p != L_(']'))
|
|
if (*p++ == L_('\0'))
|
|
/* This is no valid pattern. */
|
|
return pattern;
|
|
}
|
|
else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
|
|
|| *p == L_('!')) && p[1] == L_('('))
|
|
p = END (p + 1);
|
|
else if (*p == L_(')'))
|
|
break;
|
|
|
|
return p + 1;
|
|
}
|
|
|
|
|
|
static int
|
|
internal_function
|
|
EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
|
|
bool no_leading_period, int flags)
|
|
{
|
|
const CHAR *startp;
|
|
size_t level;
|
|
struct patternlist
|
|
{
|
|
struct patternlist *next;
|
|
CHAR str[FLEXIBLE_ARRAY_MEMBER];
|
|
} *list = NULL;
|
|
struct patternlist **lastp = &list;
|
|
size_t pattern_len = STRLEN (pattern);
|
|
const CHAR *p;
|
|
const CHAR *rs;
|
|
enum { ALLOCA_LIMIT = 8000 };
|
|
|
|
/* Parse the pattern. Store the individual parts in the list. */
|
|
level = 0;
|
|
for (startp = p = pattern + 1; ; ++p)
|
|
if (*p == L_('\0'))
|
|
/* This is an invalid pattern. */
|
|
return -1;
|
|
else if (*p == L_('['))
|
|
{
|
|
/* Handle brackets special. */
|
|
if (posixly_correct == 0)
|
|
posixly_correct = getenv ("POSIXLY_CORRECT") != NULL ? 1 : -1;
|
|
|
|
/* Skip the not sign. We have to recognize it because of a possibly
|
|
following ']'. */
|
|
if (*++p == L_('!') || (posixly_correct < 0 && *p == L_('^')))
|
|
++p;
|
|
/* A leading ']' is recognized as such. */
|
|
if (*p == L_(']'))
|
|
++p;
|
|
/* Skip over all characters of the list. */
|
|
while (*p != L_(']'))
|
|
if (*p++ == L_('\0'))
|
|
/* This is no valid pattern. */
|
|
return -1;
|
|
}
|
|
else if ((*p == L_('?') || *p == L_('*') || *p == L_('+') || *p == L_('@')
|
|
|| *p == L_('!')) && p[1] == L_('('))
|
|
/* Remember the nesting level. */
|
|
++level;
|
|
else if (*p == L_(')'))
|
|
{
|
|
if (level-- == 0)
|
|
{
|
|
/* This means we found the end of the pattern. */
|
|
#define NEW_PATTERN \
|
|
struct patternlist *newp; \
|
|
size_t plen; \
|
|
size_t plensize; \
|
|
size_t newpsize; \
|
|
\
|
|
plen = (opt == L_('?') || opt == L_('@') \
|
|
? pattern_len \
|
|
: p - startp + 1UL); \
|
|
plensize = plen * sizeof (CHAR); \
|
|
newpsize = FLEXSIZEOF (struct patternlist, str, plensize); \
|
|
if ((size_t) -1 / sizeof (CHAR) < plen \
|
|
|| newpsize < offsetof (struct patternlist, str) \
|
|
|| ALLOCA_LIMIT <= newpsize) \
|
|
return -1; \
|
|
newp = (struct patternlist *) alloca (newpsize); \
|
|
*((CHAR *) MEMPCPY (newp->str, startp, p - startp)) = L_('\0'); \
|
|
newp->next = NULL; \
|
|
*lastp = newp; \
|
|
lastp = &newp->next
|
|
NEW_PATTERN;
|
|
break;
|
|
}
|
|
}
|
|
else if (*p == L_('|'))
|
|
{
|
|
if (level == 0)
|
|
{
|
|
NEW_PATTERN;
|
|
startp = p + 1;
|
|
}
|
|
}
|
|
assert (list != NULL);
|
|
assert (p[-1] == L_(')'));
|
|
#undef NEW_PATTERN
|
|
|
|
switch (opt)
|
|
{
|
|
case L_('*'):
|
|
if (FCT (p, string, string_end, no_leading_period, flags) == 0)
|
|
return 0;
|
|
FALLTHROUGH;
|
|
case L_('+'):
|
|
do
|
|
{
|
|
for (rs = string; rs <= string_end; ++rs)
|
|
/* First match the prefix with the current pattern with the
|
|
current pattern. */
|
|
if (FCT (list->str, string, rs, no_leading_period,
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0
|
|
/* This was successful. Now match the rest with the rest
|
|
of the pattern. */
|
|
&& (FCT (p, rs, string_end,
|
|
rs == string
|
|
? no_leading_period
|
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags),
|
|
flags & FNM_FILE_NAME
|
|
? flags : flags & ~FNM_PERIOD) == 0
|
|
/* This didn't work. Try the whole pattern. */
|
|
|| (rs != string
|
|
&& FCT (pattern - 1, rs, string_end,
|
|
rs == string
|
|
? no_leading_period
|
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags),
|
|
flags & FNM_FILE_NAME
|
|
? flags : flags & ~FNM_PERIOD) == 0)))
|
|
/* It worked. Signal success. */
|
|
return 0;
|
|
}
|
|
while ((list = list->next) != NULL);
|
|
|
|
/* None of the patterns lead to a match. */
|
|
return FNM_NOMATCH;
|
|
|
|
case L_('?'):
|
|
if (FCT (p, string, string_end, no_leading_period, flags) == 0)
|
|
return 0;
|
|
FALLTHROUGH;
|
|
case L_('@'):
|
|
do
|
|
/* I cannot believe it but 'strcat' is actually acceptable
|
|
here. Match the entire string with the prefix from the
|
|
pattern list and the rest of the pattern following the
|
|
pattern list. */
|
|
if (FCT (STRCAT (list->str, p), string, string_end,
|
|
no_leading_period,
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
|
|
/* It worked. Signal success. */
|
|
return 0;
|
|
while ((list = list->next) != NULL);
|
|
|
|
/* None of the patterns lead to a match. */
|
|
return FNM_NOMATCH;
|
|
|
|
case L_('!'):
|
|
for (rs = string; rs <= string_end; ++rs)
|
|
{
|
|
struct patternlist *runp;
|
|
|
|
for (runp = list; runp != NULL; runp = runp->next)
|
|
if (FCT (runp->str, string, rs, no_leading_period,
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD) == 0)
|
|
break;
|
|
|
|
/* If none of the patterns matched see whether the rest does. */
|
|
if (runp == NULL
|
|
&& (FCT (p, rs, string_end,
|
|
rs == string
|
|
? no_leading_period
|
|
: rs[-1] == '/' && NO_LEADING_PERIOD (flags),
|
|
flags & FNM_FILE_NAME ? flags : flags & ~FNM_PERIOD)
|
|
== 0))
|
|
/* This is successful. */
|
|
return 0;
|
|
}
|
|
|
|
/* None of the patterns together with the rest of the pattern
|
|
lead to a match. */
|
|
return FNM_NOMATCH;
|
|
|
|
default:
|
|
assert (! "Invalid extended matching operator");
|
|
break;
|
|
}
|
|
|
|
return -1;
|
|
}
|
|
|
|
|
|
#undef FOLD
|
|
#undef CHAR
|
|
#undef UCHAR
|
|
#undef INT
|
|
#undef FCT
|
|
#undef EXT
|
|
#undef END
|
|
#undef MEMPCPY
|
|
#undef MEMCHR
|
|
#undef STRLEN
|
|
#undef STRCAT
|
|
#undef L_
|
|
#undef BTOWC
|