forked from Imagelibrary/binutils-gdb
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
628 lines
18 KiB
C
628 lines
18 KiB
C
/* Provide file descriptor control.
|
|
|
|
Copyright (C) 2009-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 Eric Blake <ebb9@byu.net>. */
|
|
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
#include <fcntl.h>
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stdarg.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#ifdef __KLIBC__
|
|
# define INCL_DOS
|
|
# include <os2.h>
|
|
#endif
|
|
|
|
#if defined _WIN32 && ! defined __CYGWIN__
|
|
/* Get declarations of the native Windows API functions. */
|
|
# define WIN32_LEAN_AND_MEAN
|
|
# include <windows.h>
|
|
|
|
/* Get _get_osfhandle. */
|
|
# if GNULIB_MSVC_NOTHROW
|
|
# include "msvc-nothrow.h"
|
|
# else
|
|
# include <io.h>
|
|
# endif
|
|
|
|
/* Upper bound on getdtablesize(). See lib/getdtablesize.c. */
|
|
# define OPEN_MAX_MAX 0x10000
|
|
|
|
/* Duplicate OLDFD into the first available slot of at least NEWFD,
|
|
which must be positive, with FLAGS determining whether the duplicate
|
|
will be inheritable. */
|
|
static int
|
|
dupfd (int oldfd, int newfd, int flags)
|
|
{
|
|
/* Mingw has no way to create an arbitrary fd. Iterate until all
|
|
file descriptors less than newfd are filled up. */
|
|
HANDLE curr_process = GetCurrentProcess ();
|
|
HANDLE old_handle = (HANDLE) _get_osfhandle (oldfd);
|
|
unsigned char fds_to_close[OPEN_MAX_MAX / CHAR_BIT];
|
|
unsigned int fds_to_close_bound = 0;
|
|
int result;
|
|
BOOL inherit = flags & O_CLOEXEC ? FALSE : TRUE;
|
|
int mode;
|
|
|
|
if (newfd < 0 || getdtablesize () <= newfd)
|
|
{
|
|
errno = EINVAL;
|
|
return -1;
|
|
}
|
|
if (old_handle == INVALID_HANDLE_VALUE
|
|
|| (mode = setmode (oldfd, O_BINARY)) == -1)
|
|
{
|
|
/* oldfd is not open, or is an unassigned standard file
|
|
descriptor. */
|
|
errno = EBADF;
|
|
return -1;
|
|
}
|
|
setmode (oldfd, mode);
|
|
flags |= mode;
|
|
|
|
for (;;)
|
|
{
|
|
HANDLE new_handle;
|
|
int duplicated_fd;
|
|
unsigned int index;
|
|
|
|
if (!DuplicateHandle (curr_process, /* SourceProcessHandle */
|
|
old_handle, /* SourceHandle */
|
|
curr_process, /* TargetProcessHandle */
|
|
(PHANDLE) &new_handle, /* TargetHandle */
|
|
(DWORD) 0, /* DesiredAccess */
|
|
inherit, /* InheritHandle */
|
|
DUPLICATE_SAME_ACCESS)) /* Options */
|
|
{
|
|
switch (GetLastError ())
|
|
{
|
|
case ERROR_TOO_MANY_OPEN_FILES:
|
|
errno = EMFILE;
|
|
break;
|
|
case ERROR_INVALID_HANDLE:
|
|
case ERROR_INVALID_TARGET_HANDLE:
|
|
case ERROR_DIRECT_ACCESS_HANDLE:
|
|
errno = EBADF;
|
|
break;
|
|
case ERROR_INVALID_PARAMETER:
|
|
case ERROR_INVALID_FUNCTION:
|
|
case ERROR_INVALID_ACCESS:
|
|
errno = EINVAL;
|
|
break;
|
|
default:
|
|
errno = EACCES;
|
|
break;
|
|
}
|
|
result = -1;
|
|
break;
|
|
}
|
|
duplicated_fd = _open_osfhandle ((intptr_t) new_handle, flags);
|
|
if (duplicated_fd < 0)
|
|
{
|
|
CloseHandle (new_handle);
|
|
result = -1;
|
|
break;
|
|
}
|
|
if (newfd <= duplicated_fd)
|
|
{
|
|
result = duplicated_fd;
|
|
break;
|
|
}
|
|
|
|
/* Set the bit duplicated_fd in fds_to_close[]. */
|
|
index = (unsigned int) duplicated_fd / CHAR_BIT;
|
|
if (fds_to_close_bound <= index)
|
|
{
|
|
if (sizeof fds_to_close <= index)
|
|
/* Need to increase OPEN_MAX_MAX. */
|
|
abort ();
|
|
memset (fds_to_close + fds_to_close_bound, '\0',
|
|
index + 1 - fds_to_close_bound);
|
|
fds_to_close_bound = index + 1;
|
|
}
|
|
fds_to_close[index] |= 1 << ((unsigned int) duplicated_fd % CHAR_BIT);
|
|
}
|
|
|
|
/* Close the previous fds that turned out to be too small. */
|
|
{
|
|
int saved_errno = errno;
|
|
unsigned int duplicated_fd;
|
|
|
|
for (duplicated_fd = 0;
|
|
duplicated_fd < fds_to_close_bound * CHAR_BIT;
|
|
duplicated_fd++)
|
|
if ((fds_to_close[duplicated_fd / CHAR_BIT]
|
|
>> (duplicated_fd % CHAR_BIT))
|
|
& 1)
|
|
close (duplicated_fd);
|
|
|
|
errno = saved_errno;
|
|
}
|
|
|
|
# if REPLACE_FCHDIR
|
|
if (0 <= result)
|
|
result = _gl_register_dup (oldfd, result);
|
|
# endif
|
|
return result;
|
|
}
|
|
#endif /* W32 */
|
|
|
|
/* Forward declarations, because we '#undef fcntl' in the middle of this
|
|
compilation unit. */
|
|
/* Our implementation of fcntl (fd, F_DUPFD, target). */
|
|
static int rpl_fcntl_DUPFD (int fd, int target);
|
|
/* Our implementation of fcntl (fd, F_DUPFD_CLOEXEC, target). */
|
|
static int rpl_fcntl_DUPFD_CLOEXEC (int fd, int target);
|
|
#ifdef __KLIBC__
|
|
/* Adds support for fcntl on directories. */
|
|
static int klibc_fcntl (int fd, int action, /* arg */...);
|
|
#endif
|
|
|
|
|
|
/* Perform the specified ACTION on the file descriptor FD, possibly
|
|
using the argument ARG further described below. This replacement
|
|
handles the following actions, and forwards all others on to the
|
|
native fcntl. An unrecognized ACTION returns -1 with errno set to
|
|
EINVAL.
|
|
|
|
F_DUPFD - duplicate FD, with int ARG being the minimum target fd.
|
|
If successful, return the duplicate, which will be inheritable;
|
|
otherwise return -1 and set errno.
|
|
|
|
F_DUPFD_CLOEXEC - duplicate FD, with int ARG being the minimum
|
|
target fd. If successful, return the duplicate, which will not be
|
|
inheritable; otherwise return -1 and set errno.
|
|
|
|
F_GETFD - ARG need not be present. If successful, return a
|
|
non-negative value containing the descriptor flags of FD (only
|
|
FD_CLOEXEC is portable, but other flags may be present); otherwise
|
|
return -1 and set errno. */
|
|
|
|
int
|
|
fcntl (int fd, int action, /* arg */...)
|
|
#undef fcntl
|
|
#ifdef __KLIBC__
|
|
# define fcntl klibc_fcntl
|
|
#endif
|
|
{
|
|
va_list arg;
|
|
int result = -1;
|
|
va_start (arg, action);
|
|
switch (action)
|
|
{
|
|
case F_DUPFD:
|
|
{
|
|
int target = va_arg (arg, int);
|
|
result = rpl_fcntl_DUPFD (fd, target);
|
|
break;
|
|
}
|
|
|
|
case F_DUPFD_CLOEXEC:
|
|
{
|
|
int target = va_arg (arg, int);
|
|
result = rpl_fcntl_DUPFD_CLOEXEC (fd, target);
|
|
break;
|
|
}
|
|
|
|
#if !HAVE_FCNTL
|
|
case F_GETFD:
|
|
{
|
|
# if defined _WIN32 && ! defined __CYGWIN__
|
|
HANDLE handle = (HANDLE) _get_osfhandle (fd);
|
|
DWORD flags;
|
|
if (handle == INVALID_HANDLE_VALUE
|
|
|| GetHandleInformation (handle, &flags) == 0)
|
|
errno = EBADF;
|
|
else
|
|
result = (flags & HANDLE_FLAG_INHERIT) ? 0 : FD_CLOEXEC;
|
|
# else /* !W32 */
|
|
/* Use dup2 to reject invalid file descriptors. No way to
|
|
access this information, so punt. */
|
|
if (0 <= dup2 (fd, fd))
|
|
result = 0;
|
|
# endif /* !W32 */
|
|
break;
|
|
} /* F_GETFD */
|
|
#endif /* !HAVE_FCNTL */
|
|
|
|
/* Implementing F_SETFD on mingw is not trivial - there is no
|
|
API for changing the O_NOINHERIT bit on an fd, and merely
|
|
changing the HANDLE_FLAG_INHERIT bit on the underlying handle
|
|
can lead to odd state. It may be possible by duplicating the
|
|
handle, using _open_osfhandle with the right flags, then
|
|
using dup2 to move the duplicate onto the original, but that
|
|
is not supported for now. */
|
|
|
|
default:
|
|
{
|
|
#if HAVE_FCNTL
|
|
switch (action)
|
|
{
|
|
#ifdef F_BARRIERFSYNC /* macOS */
|
|
case F_BARRIERFSYNC:
|
|
#endif
|
|
#ifdef F_CHKCLEAN /* macOS */
|
|
case F_CHKCLEAN:
|
|
#endif
|
|
#ifdef F_CLOSEM /* NetBSD, HP-UX */
|
|
case F_CLOSEM:
|
|
#endif
|
|
#ifdef F_FLUSH_DATA /* macOS */
|
|
case F_FLUSH_DATA:
|
|
#endif
|
|
#ifdef F_FREEZE_FS /* macOS */
|
|
case F_FREEZE_FS:
|
|
#endif
|
|
#ifdef F_FULLFSYNC /* macOS */
|
|
case F_FULLFSYNC:
|
|
#endif
|
|
#ifdef F_GETCONFINED /* macOS */
|
|
case F_GETCONFINED:
|
|
#endif
|
|
#ifdef F_GETDEFAULTPROTLEVEL /* macOS */
|
|
case F_GETDEFAULTPROTLEVEL:
|
|
#endif
|
|
#ifdef F_GETFD /* POSIX */
|
|
case F_GETFD:
|
|
#endif
|
|
#ifdef F_GETFL /* POSIX */
|
|
case F_GETFL:
|
|
#endif
|
|
#ifdef F_GETLEASE /* Linux */
|
|
case F_GETLEASE:
|
|
#endif
|
|
#ifdef F_GETNOSIGPIPE /* macOS */
|
|
case F_GETNOSIGPIPE:
|
|
#endif
|
|
#ifdef F_GETOWN /* POSIX */
|
|
case F_GETOWN:
|
|
#endif
|
|
#ifdef F_GETPIPE_SZ /* Linux */
|
|
case F_GETPIPE_SZ:
|
|
#endif
|
|
#ifdef F_GETPROTECTIONCLASS /* macOS */
|
|
case F_GETPROTECTIONCLASS:
|
|
#endif
|
|
#ifdef F_GETPROTECTIONLEVEL /* macOS */
|
|
case F_GETPROTECTIONLEVEL:
|
|
#endif
|
|
#ifdef F_GET_SEALS /* Linux */
|
|
case F_GET_SEALS:
|
|
#endif
|
|
#ifdef F_GETSIG /* Linux */
|
|
case F_GETSIG:
|
|
#endif
|
|
#ifdef F_MAXFD /* NetBSD */
|
|
case F_MAXFD:
|
|
#endif
|
|
#ifdef F_RECYCLE /* macOS */
|
|
case F_RECYCLE:
|
|
#endif
|
|
#ifdef F_SETFIFOENH /* HP-UX */
|
|
case F_SETFIFOENH:
|
|
#endif
|
|
#ifdef F_THAW_FS /* macOS */
|
|
case F_THAW_FS:
|
|
#endif
|
|
/* These actions take no argument. */
|
|
result = fcntl (fd, action);
|
|
break;
|
|
|
|
#ifdef F_ADD_SEALS /* Linux */
|
|
case F_ADD_SEALS:
|
|
#endif
|
|
#ifdef F_BADFD /* Solaris */
|
|
case F_BADFD:
|
|
#endif
|
|
#ifdef F_CHECK_OPENEVT /* macOS */
|
|
case F_CHECK_OPENEVT:
|
|
#endif
|
|
#ifdef F_DUP2FD /* FreeBSD, AIX, Solaris */
|
|
case F_DUP2FD:
|
|
#endif
|
|
#ifdef F_DUP2FD_CLOEXEC /* FreeBSD, Solaris */
|
|
case F_DUP2FD_CLOEXEC:
|
|
#endif
|
|
#ifdef F_DUP2FD_CLOFORK /* Solaris */
|
|
case F_DUP2FD_CLOFORK:
|
|
#endif
|
|
#ifdef F_DUPFD /* POSIX */
|
|
case F_DUPFD:
|
|
#endif
|
|
#ifdef F_DUPFD_CLOEXEC /* POSIX */
|
|
case F_DUPFD_CLOEXEC:
|
|
#endif
|
|
#ifdef F_DUPFD_CLOFORK /* Solaris */
|
|
case F_DUPFD_CLOFORK:
|
|
#endif
|
|
#ifdef F_GETXFL /* Solaris */
|
|
case F_GETXFL:
|
|
#endif
|
|
#ifdef F_GLOBAL_NOCACHE /* macOS */
|
|
case F_GLOBAL_NOCACHE:
|
|
#endif
|
|
#ifdef F_MAKECOMPRESSED /* macOS */
|
|
case F_MAKECOMPRESSED:
|
|
#endif
|
|
#ifdef F_MOVEDATAEXTENTS /* macOS */
|
|
case F_MOVEDATAEXTENTS:
|
|
#endif
|
|
#ifdef F_NOCACHE /* macOS */
|
|
case F_NOCACHE:
|
|
#endif
|
|
#ifdef F_NODIRECT /* macOS */
|
|
case F_NODIRECT:
|
|
#endif
|
|
#ifdef F_NOTIFY /* Linux */
|
|
case F_NOTIFY:
|
|
#endif
|
|
#ifdef F_OPLKACK /* IRIX */
|
|
case F_OPLKACK:
|
|
#endif
|
|
#ifdef F_OPLKREG /* IRIX */
|
|
case F_OPLKREG:
|
|
#endif
|
|
#ifdef F_RDAHEAD /* macOS */
|
|
case F_RDAHEAD:
|
|
#endif
|
|
#ifdef F_SETBACKINGSTORE /* macOS */
|
|
case F_SETBACKINGSTORE:
|
|
#endif
|
|
#ifdef F_SETCONFINED /* macOS */
|
|
case F_SETCONFINED:
|
|
#endif
|
|
#ifdef F_SETFD /* POSIX */
|
|
case F_SETFD:
|
|
#endif
|
|
#ifdef F_SETFL /* POSIX */
|
|
case F_SETFL:
|
|
#endif
|
|
#ifdef F_SETLEASE /* Linux */
|
|
case F_SETLEASE:
|
|
#endif
|
|
#ifdef F_SETNOSIGPIPE /* macOS */
|
|
case F_SETNOSIGPIPE:
|
|
#endif
|
|
#ifdef F_SETOWN /* POSIX */
|
|
case F_SETOWN:
|
|
#endif
|
|
#ifdef F_SETPIPE_SZ /* Linux */
|
|
case F_SETPIPE_SZ:
|
|
#endif
|
|
#ifdef F_SETPROTECTIONCLASS /* macOS */
|
|
case F_SETPROTECTIONCLASS:
|
|
#endif
|
|
#ifdef F_SETSIG /* Linux */
|
|
case F_SETSIG:
|
|
#endif
|
|
#ifdef F_SINGLE_WRITER /* macOS */
|
|
case F_SINGLE_WRITER:
|
|
#endif
|
|
/* These actions take an 'int' argument. */
|
|
{
|
|
int x = va_arg (arg, int);
|
|
result = fcntl (fd, action, x);
|
|
}
|
|
break;
|
|
|
|
default:
|
|
/* Other actions take a pointer argument. */
|
|
{
|
|
void *p = va_arg (arg, void *);
|
|
result = fcntl (fd, action, p);
|
|
}
|
|
break;
|
|
}
|
|
#else
|
|
errno = EINVAL;
|
|
#endif
|
|
break;
|
|
}
|
|
}
|
|
va_end (arg);
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
rpl_fcntl_DUPFD (int fd, int target)
|
|
{
|
|
int result;
|
|
#if !HAVE_FCNTL
|
|
result = dupfd (fd, target, 0);
|
|
#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR
|
|
/* Detect invalid target; needed for cygwin 1.5.x. */
|
|
if (target < 0 || getdtablesize () <= target)
|
|
{
|
|
result = -1;
|
|
errno = EINVAL;
|
|
}
|
|
else
|
|
{
|
|
/* Haiku alpha 2 loses fd flags on original. */
|
|
int flags = fcntl (fd, F_GETFD);
|
|
if (flags < 0)
|
|
result = -1;
|
|
else
|
|
{
|
|
result = fcntl (fd, F_DUPFD, target);
|
|
if (0 <= result && fcntl (fd, F_SETFD, flags) == -1)
|
|
{
|
|
int saved_errno = errno;
|
|
close (result);
|
|
result = -1;
|
|
errno = saved_errno;
|
|
}
|
|
# if REPLACE_FCHDIR
|
|
if (0 <= result)
|
|
result = _gl_register_dup (fd, result);
|
|
# endif
|
|
}
|
|
}
|
|
#else
|
|
result = fcntl (fd, F_DUPFD, target);
|
|
#endif
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
rpl_fcntl_DUPFD_CLOEXEC (int fd, int target)
|
|
{
|
|
int result;
|
|
#if !HAVE_FCNTL
|
|
result = dupfd (fd, target, O_CLOEXEC);
|
|
#else /* HAVE_FCNTL */
|
|
# if defined __HAIKU__
|
|
/* On Haiku, the system fcntl (fd, F_DUPFD_CLOEXEC, target) sets
|
|
the FD_CLOEXEC flag on fd, not on target. Therefore avoid the
|
|
system fcntl in this case. */
|
|
# define have_dupfd_cloexec -1
|
|
# else
|
|
/* Try the system call first, if the headers claim it exists
|
|
(that is, if GNULIB_defined_F_DUPFD_CLOEXEC is 0), since we
|
|
may be running with a glibc that has the macro but with an
|
|
older kernel that does not support it. Cache the
|
|
information on whether the system call really works, but
|
|
avoid caching failure if the corresponding F_DUPFD fails
|
|
for any reason. 0 = unknown, 1 = yes, -1 = no. */
|
|
static int have_dupfd_cloexec = GNULIB_defined_F_DUPFD_CLOEXEC ? -1 : 0;
|
|
if (0 <= have_dupfd_cloexec)
|
|
{
|
|
result = fcntl (fd, F_DUPFD_CLOEXEC, target);
|
|
if (0 <= result || errno != EINVAL)
|
|
{
|
|
have_dupfd_cloexec = 1;
|
|
# if REPLACE_FCHDIR
|
|
if (0 <= result)
|
|
result = _gl_register_dup (fd, result);
|
|
# endif
|
|
}
|
|
else
|
|
{
|
|
result = rpl_fcntl_DUPFD (fd, target);
|
|
if (result >= 0)
|
|
have_dupfd_cloexec = -1;
|
|
}
|
|
}
|
|
else
|
|
# endif
|
|
result = rpl_fcntl_DUPFD (fd, target);
|
|
if (0 <= result && have_dupfd_cloexec == -1)
|
|
{
|
|
int flags = fcntl (result, F_GETFD);
|
|
if (flags < 0 || fcntl (result, F_SETFD, flags | FD_CLOEXEC) == -1)
|
|
{
|
|
int saved_errno = errno;
|
|
close (result);
|
|
errno = saved_errno;
|
|
result = -1;
|
|
}
|
|
}
|
|
#endif /* HAVE_FCNTL */
|
|
return result;
|
|
}
|
|
|
|
#undef fcntl
|
|
|
|
#ifdef __KLIBC__
|
|
|
|
static int
|
|
klibc_fcntl (int fd, int action, /* arg */...)
|
|
{
|
|
va_list arg_ptr;
|
|
int arg;
|
|
struct stat sbuf;
|
|
int result;
|
|
|
|
va_start (arg_ptr, action);
|
|
arg = va_arg (arg_ptr, int);
|
|
result = fcntl (fd, action, arg);
|
|
/* EPERM for F_DUPFD, ENOTSUP for others */
|
|
if (result == -1 && (errno == EPERM || errno == ENOTSUP)
|
|
&& !fstat (fd, &sbuf) && S_ISDIR (sbuf.st_mode))
|
|
{
|
|
ULONG ulMode;
|
|
|
|
switch (action)
|
|
{
|
|
case F_DUPFD:
|
|
/* Find available fd */
|
|
while (fcntl (arg, F_GETFL) != -1 || errno != EBADF)
|
|
arg++;
|
|
|
|
result = dup2 (fd, arg);
|
|
break;
|
|
|
|
/* Using underlying APIs is right ? */
|
|
case F_GETFD:
|
|
if (DosQueryFHState (fd, &ulMode))
|
|
break;
|
|
|
|
result = (ulMode & OPEN_FLAGS_NOINHERIT) ? FD_CLOEXEC : 0;
|
|
break;
|
|
|
|
case F_SETFD:
|
|
if (arg & ~FD_CLOEXEC)
|
|
break;
|
|
|
|
if (DosQueryFHState (fd, &ulMode))
|
|
break;
|
|
|
|
if (arg & FD_CLOEXEC)
|
|
ulMode |= OPEN_FLAGS_NOINHERIT;
|
|
else
|
|
ulMode &= ~OPEN_FLAGS_NOINHERIT;
|
|
|
|
/* Filter supported flags. */
|
|
ulMode &= (OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_FAIL_ON_ERROR
|
|
| OPEN_FLAGS_NO_CACHE | OPEN_FLAGS_NOINHERIT);
|
|
|
|
if (DosSetFHState (fd, ulMode))
|
|
break;
|
|
|
|
result = 0;
|
|
break;
|
|
|
|
case F_GETFL:
|
|
result = 0;
|
|
break;
|
|
|
|
case F_SETFL:
|
|
if (arg != 0)
|
|
break;
|
|
|
|
result = 0;
|
|
break;
|
|
|
|
default:
|
|
errno = EINVAL;
|
|
break;
|
|
}
|
|
}
|
|
|
|
va_end (arg_ptr);
|
|
|
|
return result;
|
|
}
|
|
|
|
#endif
|