mirror of
https://sourceware.org/git/binutils-gdb.git
synced 2024-12-21 04:42:53 +08:00
698be2d8e5
This fixes two issues on Windows: Update. https://sourceware.org/pipermail/gdb-patches/2020-June/169978.html gnulib/ChangeLog: 2020-08-26 Christian Biesinger <cbiesinger@google.com> Pedro Alves <palves@redhat.com> Joel Brobecker <brobecker@adacore.com> * Makefile.in: Regenerate. * aclocal.m4: Regenerate. * config.in: Regenerate. * configure: Regenerate. * import/Makefile.am: Update. * import/Makefile.in: Regenerate. * import/alloca.in.h (if): Update. * import/assure.h (affirm): Update. * import/at-func.c: Update. * import/attribute.h: New file. * import/btowc.c: New file. * import/canonicalize-lgpl.c: Update. * import/count-one-bits.h (COUNT_ONE_BITS_GENERIC): Update. (COUNT_ONE_BITS): Update. (intrinsic): Update. (__popcnt64): Update. (popcount_supported): Update. * import/ctype.in.h: New file. * import/dirent-private.h (WIN32_FIND_DATA): Update. * import/dirent.in.h (_GL_ATTRIBUTE_PURE): Update. * import/dirname.h: Update. * import/dosname.h: Remove. * import/error.h (_GL_ATTRIBUTE_FORMAT): Update. * import/extra/update-copyright: Update. * import/fchdir.c: Update. * import/fcntl.in.h (GNULIB_defined_rpl_fcntl): Update. (GNULIB_defined_fcntl): Update. * import/filename.h (HAS_DEVICE): Update. (IS_ABSOLUTE_PATH): Update. (IS_PATH_WITH_DIR): Update. (FILE_SYSTEM_PREFIX_LEN): Update. (_IS_DRIVE_LETTER): Update. (FILE_SYSTEM_DRIVE_PREFIX_CAN_BE_RELATIVE): Update. (IS_ABSOLUTE_FILE_NAME): Update. (IS_RELATIVE_FILE_NAME): Update. (IS_FILE_NAME_WITH_DIR): Update. * import/filenamecat-lgpl.c (mfile_name_concat): Update. * import/fnmatch.c (WIDE_CHAR_SUPPORT): Update. (btowc): Update. (iswctype): Update. (mempcpy): Update. (strnlen): Update. (towlower): Update. (wcscat): Update. (wcslen): Update. (wctype): Update. (wmemchr): Update. (wmempcpy): Update. (SIZE_MAX): Update. (isblank): Update. (__libc_use_alloca): Update. (alloca): Update. (alloca_account): Update. (STREQ): Update. (CHAR_CLASS_MAX_LENGTH): Update. (IS_CHAR_CLASS): Update. (ISWCTYPE): Update. (if): Update. (HANDLE_MULTIBYTE): Update. (internal_function): Update. (FOLD): Update. (CHAR): Update. (UCHAR): Update. (INT): Update. (FCT): Update. (EXT): Update. (END): Update. (L_): Update. (BTOWC): Update. (STRLEN): Update. (STRCAT): Update. (MEMPCPY): Update. (MEMCHR): Update. (WIDE_CHAR_VERSION): Update. (STRUCT): Update. (FINDIDX): Update. (findidx): Update. (ALLOCA_LIMIT): Update. (SHLIB_COMPAT): Update. * import/fnmatch_loop.c (struct STRUCT): Update. (FCT): Update. (EXT): Update. (END): Update. (str): Update. (NEW_PATTERN): Update. * import/getcwd.c: Update. * import/getlogin_r.c (GetUserName): Update. * import/getprogname.c (getprogname): Update. * import/getrandom.c: New file. * import/gettimeofday.c: Remove. * import/glob.in.h (_Restrict_): Update. * import/inttypes.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. * import/isblank.c: New file. * import/isnanl-nolibm.h (__has_builtin): Update. * import/libc-config.h (versioned_symbol): Update. (compat_symbol): Update. * import/limits.in.h (_GL_ALREADY_INCLUDING_LIMITS_H): Update. * import/m4/btowc.m4: New file. * import/m4/ctype.m4: New file. * import/m4/exponentl.m4: Update. * import/m4/fnmatch.m4: Update. * import/m4/getrandom.m4: New file. * import/m4/glob.m4: Update. * import/m4/gnulib-cache.m4: Update. * import/m4/gnulib-common.m4: Update. * import/m4/gnulib-comp.m4: Update. * import/m4/inttypes.m4: Update. * import/m4/isblank.m4: New file. * import/m4/isnanl.m4: Update. * import/m4/largefile.m4: Update. * import/m4/mbtowc.m4: New file. * import/m4/memmem.m4: Update. * import/m4/minmax.m4: New file. * import/m4/signal_h.m4: Update. * import/m4/stdio_h.m4: Update. * import/m4/stdlib_h.m4: Update. * import/m4/string_h.m4: Update. * import/m4/strnlen.m4: New file. * import/m4/sys_random_h.m4: New file. * import/m4/sys_socket_h.m4: Update. * import/m4/sys_stat_h.m4: Update. * import/m4/time_h.m4: Update. * import/m4/unistd_h.m4: Update. * import/m4/wchar_h.m4: Update. * import/m4/wint_t.m4: Update. * import/m4/wmemchr.m4: New file. * import/m4/wmempcpy.m4: New file. * import/math.in.h (__has_builtin): Update. * import/mbrtowc.c (FALLTHROUGH): Update. * import/mbtowc-impl.h: New file. * import/mbtowc.c: New file. * import/minmax.h: New file. * import/open.c (open): Update. * import/openat-proc.c (openat_proc_name): Update. * import/openat.c (rpl_openat): Update. (openat_needs_fchdir): Update. * import/openat.h (FCHOWNAT_INLINE): Update. (CHOWNAT_INLINE): Update. (FCHMODAT_INLINE): Update. (CHMODAT_INLINE): Update. * import/opendir.c (WIN32_FIND_DATA): Update. (GetFullPathName): Update. (FindFirstFile): Update. * import/readdir.c (FindNextFile): Update. * import/rename.c (MoveFileEx): Update. * import/rewinddir.c (FindFirstFile): Update. * import/rmdir.c: Update. * import/signal.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. * import/stat-w32.c (_WIN32_WINNT): Update. (LoadLibrary): Update. (GetFinalPathNameByHandle): Update. (GetProcAddress): Update. (DWORD): Update. (GetFileInformationByHandleExFunc): Update. (GetFinalPathNameByHandleFunc): Update. * import/stat.c (WIN32_FIND_DATA): Update. (CreateFile): Update. (FindFirstFile): Update. * import/stdio.in.h (_GL_ATTRIBUTE_FORMAT): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_FUNCDECL_RPL_1): Update. (_GL_CXXALIAS_RPL_1): Update. (_GL_CXXALIAS_SYS_CAST): Update. * import/stdlib.in.h (_GL_ATTRIBUTE_PURE): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. * import/string.in.h (_GL_ATTRIBUTE_PURE): Update. (_GL_WARN_ON_USE): Update. (_GL_WARN_ON_USE_CXX): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. (mbstok_r): Update. * import/strnlen.c: New file. * import/sys_random.in.h: New file. * import/sys_socket.in.h (GNULIB_defined_socklen_t): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS_CAST): Update. * import/sys_stat.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (lchmod): Update. (_GL_CXXALIAS_RPL_1): Update. (stat): Update. * import/tempname.c (__set_errno): Update. (__secure_getenv): Update. (__try_tempname): Update. (__getpid): Update. (__gettimeofday): Update. (RANDOM_BITS): Update. (uint64_t): Update. (RANDOM_VALUE_MAX): Update. (BASE_62_DIGITS): Update. (BASE_62_POWER): Update. (try_tempname_len): Update. (try_file): Update. (try_dir): Update. (try_nocreate): Update. (gen_tempname_len): Update. (__gen_tempname): Update. (try_tempname): Update. * import/tempname.h (gen_tempname_len): Update. (try_tempname_len): Update. * import/time.in.h (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. (_GL_CXXALIAS_SYS): Update. * import/unistd.in.h (if): Update. (_GL_FUNCDECL_SYS): Update. (_GL_CXXALIAS_SYS): Update. (_GL_CXXALIASWARN): Update. (_GL_WARN_ON_USE): Update. (_GL_FUNCDECL_RPL): Update. (_GL_CXXALIAS_RPL): Update. * import/verify.h: Update. * import/warn-on-use.h (_GL_WARN_ON_USE_CXX): Update. * import/wchar.in.h (_GL_ATTRIBUTE_PURE): 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. (_GL_CXXALIAS_SYS_CAST2): Update. (_GL_CXXALIASWARN1): Update. * import/windows-rwlock.c (CreateEvent): Update. * import/wmemchr-impl.h: New file. * import/wmemchr.c: New file. * import/wmempcpy.c: New file. * update-gnulib.sh (IMPORTED_GNULIB_MODULES): Add gettimeofday. (GNULIB_COMMIT_SHA1): Update gnulib revision.
210 lines
5.8 KiB
C
210 lines
5.8 KiB
C
/* fchdir replacement.
|
|
Copyright (C) 2006-2020 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/>. */
|
|
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
#include <unistd.h>
|
|
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdbool.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
|
|
#include "assure.h"
|
|
#include "filename.h"
|
|
#include "filenamecat.h"
|
|
|
|
#ifndef REPLACE_OPEN_DIRECTORY
|
|
# define REPLACE_OPEN_DIRECTORY 0
|
|
#endif
|
|
|
|
/* This replacement assumes that a directory is not renamed while opened
|
|
through a file descriptor.
|
|
|
|
FIXME: On mingw, this would be possible to enforce if we were to
|
|
also open a HANDLE to each directory currently visited by a file
|
|
descriptor, since mingw refuses to rename any in-use file system
|
|
object. */
|
|
|
|
/* Array of file descriptors opened. If REPLACE_OPEN_DIRECTORY or if it points
|
|
to a directory, it stores info about this directory. */
|
|
typedef struct
|
|
{
|
|
char *name; /* Absolute name of the directory, or NULL. */
|
|
/* FIXME - add a DIR* member to make dirfd possible on mingw? */
|
|
} dir_info_t;
|
|
static dir_info_t *dirs;
|
|
static size_t dirs_allocated;
|
|
|
|
/* Try to ensure dirs has enough room for a slot at index fd; free any
|
|
contents already in that slot. Return false and set errno to
|
|
ENOMEM on allocation failure. */
|
|
static bool
|
|
ensure_dirs_slot (size_t fd)
|
|
{
|
|
if (fd < dirs_allocated)
|
|
free (dirs[fd].name);
|
|
else
|
|
{
|
|
size_t new_allocated;
|
|
dir_info_t *new_dirs;
|
|
|
|
new_allocated = 2 * dirs_allocated + 1;
|
|
if (new_allocated <= fd)
|
|
new_allocated = fd + 1;
|
|
new_dirs =
|
|
(dirs != NULL
|
|
? (dir_info_t *) realloc (dirs, new_allocated * sizeof *dirs)
|
|
: (dir_info_t *) malloc (new_allocated * sizeof *dirs));
|
|
if (new_dirs == NULL)
|
|
return false;
|
|
memset (new_dirs + dirs_allocated, 0,
|
|
(new_allocated - dirs_allocated) * sizeof *dirs);
|
|
dirs = new_dirs;
|
|
dirs_allocated = new_allocated;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/* Return an absolute name of DIR in malloc'd storage.
|
|
Upon failure, return NULL with errno set. */
|
|
static char *
|
|
get_name (char const *dir)
|
|
{
|
|
char *cwd;
|
|
char *result;
|
|
int saved_errno;
|
|
|
|
if (IS_ABSOLUTE_FILE_NAME (dir))
|
|
return strdup (dir);
|
|
|
|
/* We often encounter "."; treat it as a special case. */
|
|
cwd = getcwd (NULL, 0);
|
|
if (!cwd || (dir[0] == '.' && dir[1] == '\0'))
|
|
return cwd;
|
|
|
|
result = mfile_name_concat (cwd, dir, NULL);
|
|
saved_errno = errno;
|
|
free (cwd);
|
|
errno = saved_errno;
|
|
return result;
|
|
}
|
|
|
|
/* Hook into the gnulib replacements for open() and close() to keep track
|
|
of the open file descriptors. */
|
|
|
|
/* Close FD, cleaning up any fd to name mapping if fd was visiting a
|
|
directory. */
|
|
void
|
|
_gl_unregister_fd (int fd)
|
|
{
|
|
if (fd >= 0 && fd < dirs_allocated)
|
|
{
|
|
free (dirs[fd].name);
|
|
dirs[fd].name = NULL;
|
|
}
|
|
}
|
|
|
|
/* Mark FD as visiting FILENAME. FD must be non-negative, and refer
|
|
to an open file descriptor. If REPLACE_OPEN_DIRECTORY is non-zero,
|
|
this should only be called if FD is visiting a directory. Close FD
|
|
and return -1 with errno set if there is insufficient memory to track
|
|
the directory name; otherwise return FD. */
|
|
int
|
|
_gl_register_fd (int fd, const char *filename)
|
|
{
|
|
struct stat statbuf;
|
|
|
|
assure (0 <= fd);
|
|
if (REPLACE_OPEN_DIRECTORY
|
|
|| (fstat (fd, &statbuf) == 0 && S_ISDIR (statbuf.st_mode)))
|
|
{
|
|
if (!ensure_dirs_slot (fd)
|
|
|| (dirs[fd].name = get_name (filename)) == NULL)
|
|
{
|
|
int saved_errno = errno;
|
|
close (fd);
|
|
errno = saved_errno;
|
|
return -1;
|
|
}
|
|
}
|
|
return fd;
|
|
}
|
|
|
|
/* Mark NEWFD as a duplicate of OLDFD; useful from dup, dup2, dup3,
|
|
and fcntl. Both arguments must be valid and distinct file
|
|
descriptors. Close NEWFD and return -1 if OLDFD is tracking a
|
|
directory, but there is insufficient memory to track the same
|
|
directory in NEWFD; otherwise return NEWFD. */
|
|
int
|
|
_gl_register_dup (int oldfd, int newfd)
|
|
{
|
|
assure (0 <= oldfd && 0 <= newfd && oldfd != newfd);
|
|
if (oldfd < dirs_allocated && dirs[oldfd].name)
|
|
{
|
|
/* Duplicated a directory; must ensure newfd is allocated. */
|
|
if (!ensure_dirs_slot (newfd)
|
|
|| (dirs[newfd].name = strdup (dirs[oldfd].name)) == NULL)
|
|
{
|
|
int saved_errno = errno;
|
|
close (newfd);
|
|
errno = saved_errno;
|
|
newfd = -1;
|
|
}
|
|
}
|
|
else if (newfd < dirs_allocated)
|
|
{
|
|
/* Duplicated a non-directory; ensure newfd is cleared. */
|
|
free (dirs[newfd].name);
|
|
dirs[newfd].name = NULL;
|
|
}
|
|
return newfd;
|
|
}
|
|
|
|
/* If FD is currently visiting a directory, then return the name of
|
|
that directory. Otherwise, return NULL and set errno. */
|
|
const char *
|
|
_gl_directory_name (int fd)
|
|
{
|
|
if (0 <= fd && fd < dirs_allocated && dirs[fd].name != NULL)
|
|
return dirs[fd].name;
|
|
/* At this point, fd is either invalid, or open but not a directory.
|
|
If dup2 fails, errno is correctly EBADF. */
|
|
if (0 <= fd)
|
|
{
|
|
if (dup2 (fd, fd) == fd)
|
|
errno = ENOTDIR;
|
|
}
|
|
else
|
|
errno = EBADF;
|
|
return NULL;
|
|
}
|
|
|
|
|
|
/* Implement fchdir() in terms of chdir(). */
|
|
|
|
int
|
|
fchdir (int fd)
|
|
{
|
|
const char *name = _gl_directory_name (fd);
|
|
return name ? chdir (name) : -1;
|
|
}
|