mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-11-23 18:14:13 +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
452 lines
13 KiB
C
452 lines
13 KiB
C
/* strerror_r.c --- POSIX compatible system error routine
|
|
|
|
Copyright (C) 2010-2019 Free Software Foundation, Inc.
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, 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/>. */
|
|
|
|
/* Written by Bruno Haible <bruno@clisp.org>, 2010. */
|
|
|
|
#include <config.h>
|
|
|
|
/* Enable declaration of sys_nerr and sys_errlist in <errno.h> on NetBSD. */
|
|
#define _NETBSD_SOURCE 1
|
|
|
|
/* Specification. */
|
|
#include <string.h>
|
|
|
|
#include <errno.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#if !HAVE_SNPRINTF
|
|
# include <stdarg.h>
|
|
#endif
|
|
|
|
#include "strerror-override.h"
|
|
|
|
#if (__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__) && HAVE___XPG_STRERROR_R /* glibc >= 2.3.4, cygwin >= 1.7.9 */
|
|
|
|
# define USE_XPG_STRERROR_R 1
|
|
extern
|
|
#ifdef __cplusplus
|
|
"C"
|
|
#endif
|
|
int __xpg_strerror_r (int errnum, char *buf, size_t buflen);
|
|
|
|
#elif HAVE_DECL_STRERROR_R && !(__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__)
|
|
|
|
/* The system's strerror_r function is OK, except that its third argument
|
|
is 'int', not 'size_t', or its return type is wrong. */
|
|
|
|
# include <limits.h>
|
|
|
|
# define USE_SYSTEM_STRERROR_R 1
|
|
|
|
#else /* (__GLIBC__ >= 2 || defined __UCLIBC__ || defined __CYGWIN__ ? !HAVE___XPG_STRERROR_R : !HAVE_DECL_STRERROR_R) */
|
|
|
|
/* Use the system's strerror(). Exclude glibc and cygwin because the
|
|
system strerror_r has the wrong return type, and cygwin 1.7.9
|
|
strerror_r clobbers strerror. */
|
|
# undef strerror
|
|
|
|
# define USE_SYSTEM_STRERROR 1
|
|
|
|
# if defined __NetBSD__ || defined __hpux || (defined _WIN32 && !defined __CYGWIN__) || defined __sgi || (defined __sun && !defined _LP64) || defined __CYGWIN__
|
|
|
|
/* No locking needed. */
|
|
|
|
/* Get catgets internationalization functions. */
|
|
# if HAVE_CATGETS
|
|
# include <nl_types.h>
|
|
# endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* Get sys_nerr, sys_errlist on HP-UX (otherwise only declared in C++ mode).
|
|
Get sys_nerr, sys_errlist on IRIX (otherwise only declared with _SGIAPI). */
|
|
# if defined __hpux || defined __sgi
|
|
extern int sys_nerr;
|
|
extern char *sys_errlist[];
|
|
# endif
|
|
|
|
/* Get sys_nerr on Solaris. */
|
|
# if defined __sun && !defined _LP64
|
|
extern int sys_nerr;
|
|
# endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
# else
|
|
|
|
# include "glthread/lock.h"
|
|
|
|
/* This lock protects the buffer returned by strerror(). We assume that
|
|
no other uses of strerror() exist in the program. */
|
|
gl_lock_define_initialized(static, strerror_lock)
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
/* On MSVC, there is no snprintf() function, just a _snprintf().
|
|
It is of lower quality, but sufficient for the simple use here.
|
|
We only have to make sure to NUL terminate the result (_snprintf
|
|
does not NUL terminate, like strncpy). */
|
|
#if !HAVE_SNPRINTF
|
|
static int
|
|
local_snprintf (char *buf, size_t buflen, const char *format, ...)
|
|
{
|
|
va_list args;
|
|
int result;
|
|
|
|
va_start (args, format);
|
|
result = _vsnprintf (buf, buflen, format, args);
|
|
va_end (args);
|
|
if (buflen > 0 && (result < 0 || result >= buflen))
|
|
buf[buflen - 1] = '\0';
|
|
return result;
|
|
}
|
|
# define snprintf local_snprintf
|
|
#endif
|
|
|
|
/* Copy as much of MSG into BUF as possible, without corrupting errno.
|
|
Return 0 if MSG fit in BUFLEN, otherwise return ERANGE. */
|
|
static int
|
|
safe_copy (char *buf, size_t buflen, const char *msg)
|
|
{
|
|
size_t len = strlen (msg);
|
|
size_t moved = len < buflen ? len : buflen - 1;
|
|
|
|
/* Although POSIX lets memmove corrupt errno, we don't
|
|
know of any implementation where this is a real problem. */
|
|
memmove (buf, msg, moved);
|
|
buf[moved] = '\0';
|
|
return len < buflen ? 0 : ERANGE;
|
|
}
|
|
|
|
|
|
int
|
|
strerror_r (int errnum, char *buf, size_t buflen)
|
|
#undef strerror_r
|
|
{
|
|
/* Filter this out now, so that rest of this replacement knows that
|
|
there is room for a non-empty message and trailing NUL. */
|
|
if (buflen <= 1)
|
|
{
|
|
if (buflen)
|
|
*buf = '\0';
|
|
return ERANGE;
|
|
}
|
|
*buf = '\0';
|
|
|
|
/* Check for gnulib overrides. */
|
|
{
|
|
char const *msg = strerror_override (errnum);
|
|
|
|
if (msg)
|
|
return safe_copy (buf, buflen, msg);
|
|
}
|
|
|
|
{
|
|
int ret;
|
|
int saved_errno = errno;
|
|
|
|
#if USE_XPG_STRERROR_R
|
|
|
|
{
|
|
ret = __xpg_strerror_r (errnum, buf, buflen);
|
|
if (ret < 0)
|
|
ret = errno;
|
|
if (!*buf)
|
|
{
|
|
/* glibc 2.13 would not touch buf on err, so we have to fall
|
|
back to GNU strerror_r which always returns a thread-safe
|
|
untruncated string to (partially) copy into our buf. */
|
|
safe_copy (buf, buflen, strerror_r (errnum, buf, buflen));
|
|
}
|
|
}
|
|
|
|
#elif USE_SYSTEM_STRERROR_R
|
|
|
|
if (buflen > INT_MAX)
|
|
buflen = INT_MAX;
|
|
|
|
# ifdef __hpux
|
|
/* On HP-UX 11.31, strerror_r always fails when buflen < 80; it
|
|
also fails to change buf on EINVAL. */
|
|
{
|
|
char stackbuf[80];
|
|
|
|
if (buflen < sizeof stackbuf)
|
|
{
|
|
ret = strerror_r (errnum, stackbuf, sizeof stackbuf);
|
|
if (ret == 0)
|
|
ret = safe_copy (buf, buflen, stackbuf);
|
|
}
|
|
else
|
|
ret = strerror_r (errnum, buf, buflen);
|
|
}
|
|
# else
|
|
ret = strerror_r (errnum, buf, buflen);
|
|
|
|
/* Some old implementations may return (-1, EINVAL) instead of EINVAL.
|
|
But on Haiku, valid error numbers are negative. */
|
|
# if !defined __HAIKU__
|
|
if (ret < 0)
|
|
ret = errno;
|
|
# endif
|
|
# endif
|
|
|
|
# if defined _AIX || defined __HAIKU__
|
|
/* AIX and Haiku return 0 rather than ERANGE when truncating strings; try
|
|
again until we are sure we got the entire string. */
|
|
if (!ret && strlen (buf) == buflen - 1)
|
|
{
|
|
char stackbuf[STACKBUF_LEN];
|
|
size_t len;
|
|
strerror_r (errnum, stackbuf, sizeof stackbuf);
|
|
len = strlen (stackbuf);
|
|
/* STACKBUF_LEN should have been large enough. */
|
|
if (len + 1 == sizeof stackbuf)
|
|
abort ();
|
|
if (buflen <= len)
|
|
ret = ERANGE;
|
|
}
|
|
# else
|
|
/* Solaris 10 does not populate buf on ERANGE. OpenBSD 4.7
|
|
truncates early on ERANGE rather than return a partial integer.
|
|
We prefer the maximal string. We set buf[0] earlier, and we
|
|
know of no implementation that modifies buf to be an
|
|
unterminated string, so this strlen should be portable in
|
|
practice (rather than pulling in a safer strnlen). */
|
|
if (ret == ERANGE && strlen (buf) < buflen - 1)
|
|
{
|
|
char stackbuf[STACKBUF_LEN];
|
|
|
|
/* STACKBUF_LEN should have been large enough. */
|
|
if (strerror_r (errnum, stackbuf, sizeof stackbuf) == ERANGE)
|
|
abort ();
|
|
safe_copy (buf, buflen, stackbuf);
|
|
}
|
|
# endif
|
|
|
|
#else /* USE_SYSTEM_STRERROR */
|
|
|
|
/* Try to do what strerror (errnum) does, but without clobbering the
|
|
buffer used by strerror(). */
|
|
|
|
# if defined __NetBSD__ || defined __hpux || (defined _WIN32 && !defined __CYGWIN__) || defined __CYGWIN__ /* NetBSD, HP-UX, native Windows, Cygwin */
|
|
|
|
/* NetBSD: sys_nerr, sys_errlist are declared through _NETBSD_SOURCE
|
|
and <errno.h> above.
|
|
HP-UX: sys_nerr, sys_errlist are declared explicitly above.
|
|
native Windows: sys_nerr, sys_errlist are declared in <stdlib.h>.
|
|
Cygwin: sys_nerr, sys_errlist are declared in <errno.h>. */
|
|
if (errnum >= 0 && errnum < sys_nerr)
|
|
{
|
|
# if HAVE_CATGETS && (defined __NetBSD__ || defined __hpux)
|
|
# if defined __NetBSD__
|
|
nl_catd catd = catopen ("libc", NL_CAT_LOCALE);
|
|
const char *errmsg =
|
|
(catd != (nl_catd)-1
|
|
? catgets (catd, 1, errnum, sys_errlist[errnum])
|
|
: sys_errlist[errnum]);
|
|
# endif
|
|
# if defined __hpux
|
|
nl_catd catd = catopen ("perror", NL_CAT_LOCALE);
|
|
const char *errmsg =
|
|
(catd != (nl_catd)-1
|
|
? catgets (catd, 1, 1 + errnum, sys_errlist[errnum])
|
|
: sys_errlist[errnum]);
|
|
# endif
|
|
# else
|
|
const char *errmsg = sys_errlist[errnum];
|
|
# endif
|
|
if (errmsg == NULL || *errmsg == '\0')
|
|
ret = EINVAL;
|
|
else
|
|
ret = safe_copy (buf, buflen, errmsg);
|
|
# if HAVE_CATGETS && (defined __NetBSD__ || defined __hpux)
|
|
if (catd != (nl_catd)-1)
|
|
catclose (catd);
|
|
# endif
|
|
}
|
|
else
|
|
ret = EINVAL;
|
|
|
|
# elif defined __sgi || (defined __sun && !defined _LP64) /* IRIX, Solaris <= 9 32-bit */
|
|
|
|
/* For a valid error number, the system's strerror() function returns
|
|
a pointer to a not copied string, not to a buffer. */
|
|
if (errnum >= 0 && errnum < sys_nerr)
|
|
{
|
|
char *errmsg = strerror (errnum);
|
|
|
|
if (errmsg == NULL || *errmsg == '\0')
|
|
ret = EINVAL;
|
|
else
|
|
ret = safe_copy (buf, buflen, errmsg);
|
|
}
|
|
else
|
|
ret = EINVAL;
|
|
|
|
# else
|
|
|
|
gl_lock_lock (strerror_lock);
|
|
|
|
{
|
|
char *errmsg = strerror (errnum);
|
|
|
|
/* For invalid error numbers, strerror() on
|
|
- IRIX 6.5 returns NULL,
|
|
- HP-UX 11 returns an empty string. */
|
|
if (errmsg == NULL || *errmsg == '\0')
|
|
ret = EINVAL;
|
|
else
|
|
ret = safe_copy (buf, buflen, errmsg);
|
|
}
|
|
|
|
gl_lock_unlock (strerror_lock);
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#if defined _WIN32 && !defined __CYGWIN__
|
|
/* MSVC 14 defines names for many error codes in the range 100..140,
|
|
but _sys_errlist contains strings only for the error codes
|
|
< _sys_nerr = 43. */
|
|
if (ret == EINVAL)
|
|
{
|
|
const char *errmsg;
|
|
|
|
switch (errnum)
|
|
{
|
|
case 100 /* EADDRINUSE */:
|
|
errmsg = "Address already in use";
|
|
break;
|
|
case 101 /* EADDRNOTAVAIL */:
|
|
errmsg = "Cannot assign requested address";
|
|
break;
|
|
case 102 /* EAFNOSUPPORT */:
|
|
errmsg = "Address family not supported by protocol";
|
|
break;
|
|
case 103 /* EALREADY */:
|
|
errmsg = "Operation already in progress";
|
|
break;
|
|
case 105 /* ECANCELED */:
|
|
errmsg = "Operation canceled";
|
|
break;
|
|
case 106 /* ECONNABORTED */:
|
|
errmsg = "Software caused connection abort";
|
|
break;
|
|
case 107 /* ECONNREFUSED */:
|
|
errmsg = "Connection refused";
|
|
break;
|
|
case 108 /* ECONNRESET */:
|
|
errmsg = "Connection reset by peer";
|
|
break;
|
|
case 109 /* EDESTADDRREQ */:
|
|
errmsg = "Destination address required";
|
|
break;
|
|
case 110 /* EHOSTUNREACH */:
|
|
errmsg = "No route to host";
|
|
break;
|
|
case 112 /* EINPROGRESS */:
|
|
errmsg = "Operation now in progress";
|
|
break;
|
|
case 113 /* EISCONN */:
|
|
errmsg = "Transport endpoint is already connected";
|
|
break;
|
|
case 114 /* ELOOP */:
|
|
errmsg = "Too many levels of symbolic links";
|
|
break;
|
|
case 115 /* EMSGSIZE */:
|
|
errmsg = "Message too long";
|
|
break;
|
|
case 116 /* ENETDOWN */:
|
|
errmsg = "Network is down";
|
|
break;
|
|
case 117 /* ENETRESET */:
|
|
errmsg = "Network dropped connection on reset";
|
|
break;
|
|
case 118 /* ENETUNREACH */:
|
|
errmsg = "Network is unreachable";
|
|
break;
|
|
case 119 /* ENOBUFS */:
|
|
errmsg = "No buffer space available";
|
|
break;
|
|
case 123 /* ENOPROTOOPT */:
|
|
errmsg = "Protocol not available";
|
|
break;
|
|
case 126 /* ENOTCONN */:
|
|
errmsg = "Transport endpoint is not connected";
|
|
break;
|
|
case 128 /* ENOTSOCK */:
|
|
errmsg = "Socket operation on non-socket";
|
|
break;
|
|
case 129 /* ENOTSUP */:
|
|
errmsg = "Not supported";
|
|
break;
|
|
case 130 /* EOPNOTSUPP */:
|
|
errmsg = "Operation not supported";
|
|
break;
|
|
case 132 /* EOVERFLOW */:
|
|
errmsg = "Value too large for defined data type";
|
|
break;
|
|
case 133 /* EOWNERDEAD */:
|
|
errmsg = "Owner died";
|
|
break;
|
|
case 134 /* EPROTO */:
|
|
errmsg = "Protocol error";
|
|
break;
|
|
case 135 /* EPROTONOSUPPORT */:
|
|
errmsg = "Protocol not supported";
|
|
break;
|
|
case 136 /* EPROTOTYPE */:
|
|
errmsg = "Protocol wrong type for socket";
|
|
break;
|
|
case 138 /* ETIMEDOUT */:
|
|
errmsg = "Connection timed out";
|
|
break;
|
|
case 140 /* EWOULDBLOCK */:
|
|
errmsg = "Operation would block";
|
|
break;
|
|
default:
|
|
errmsg = NULL;
|
|
break;
|
|
}
|
|
if (errmsg != NULL)
|
|
ret = safe_copy (buf, buflen, errmsg);
|
|
}
|
|
#endif
|
|
|
|
if (ret == EINVAL && !*buf)
|
|
{
|
|
#if defined __HAIKU__
|
|
/* For consistency with perror(). */
|
|
snprintf (buf, buflen, "Unknown Application Error (%d)", errnum);
|
|
#else
|
|
snprintf (buf, buflen, "Unknown error %d", errnum);
|
|
#endif
|
|
}
|
|
|
|
errno = saved_errno;
|
|
return ret;
|
|
}
|
|
}
|