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.
322 lines
8.7 KiB
C
322 lines
8.7 KiB
C
/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library 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.
|
|
|
|
The GNU C Library 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 the GNU C Library; if not, see
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#if !_LIBC
|
|
# include <libc-config.h>
|
|
# include "tempname.h"
|
|
#endif
|
|
|
|
#include <sys/types.h>
|
|
#include <assert.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
|
#ifndef P_tmpdir
|
|
# define P_tmpdir "/tmp"
|
|
#endif
|
|
#ifndef TMP_MAX
|
|
# define TMP_MAX 238328
|
|
#endif
|
|
#ifndef __GT_FILE
|
|
# define __GT_FILE 0
|
|
# define __GT_DIR 1
|
|
# define __GT_NOCREATE 2
|
|
#endif
|
|
#if !_LIBC && (GT_FILE != __GT_FILE || GT_DIR != __GT_DIR \
|
|
|| GT_NOCREATE != __GT_NOCREATE)
|
|
# error report this to bug-gnulib@gnu.org
|
|
#endif
|
|
|
|
#include <stddef.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <fcntl.h>
|
|
#include <stdint.h>
|
|
#include <sys/random.h>
|
|
#include <sys/stat.h>
|
|
|
|
#if _LIBC
|
|
# define struct_stat64 struct stat64
|
|
# define __secure_getenv __libc_secure_getenv
|
|
#else
|
|
# define struct_stat64 struct stat
|
|
# define __gen_tempname gen_tempname
|
|
# define __mkdir mkdir
|
|
# define __open open
|
|
# define __lxstat64(version, file, buf) lstat (file, buf)
|
|
#endif
|
|
|
|
#ifdef _LIBC
|
|
# include <random-bits.h>
|
|
# define RANDOM_BITS(Var) ((Var) = random_bits ())
|
|
typedef uint32_t random_value;
|
|
# define RANDOM_VALUE_MAX UINT32_MAX
|
|
# define BASE_62_DIGITS 5 /* 62**5 < UINT32_MAX */
|
|
# define BASE_62_POWER (62 * 62 * 62 * 62 * 62) /* 2**BASE_62_DIGITS */
|
|
#else
|
|
/* Use getrandom if it works, falling back on a 64-bit linear
|
|
congruential generator that starts with whatever Var's value
|
|
happens to be. */
|
|
# define RANDOM_BITS(Var) \
|
|
((void) (getrandom (&(Var), sizeof (Var), 0) == sizeof (Var) \
|
|
|| ((Var) = 2862933555777941757 * (Var) + 3037000493)))
|
|
typedef uint_fast64_t random_value;
|
|
# define RANDOM_VALUE_MAX UINT_FAST64_MAX
|
|
# define BASE_62_DIGITS 10 /* 62**10 < UINT_FAST64_MAX */
|
|
# define BASE_62_POWER (62LL * 62 * 62 * 62 * 62 * 62 * 62 * 62 * 62 * 62)
|
|
#endif
|
|
|
|
#if _LIBC
|
|
/* Return nonzero if DIR is an existent directory. */
|
|
static int
|
|
direxists (const char *dir)
|
|
{
|
|
struct_stat64 buf;
|
|
return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
|
|
}
|
|
|
|
/* Path search algorithm, for tmpnam, tmpfile, etc. If DIR is
|
|
non-null and exists, uses it; otherwise uses the first of $TMPDIR,
|
|
P_tmpdir, /tmp that exists. Copies into TMPL a template suitable
|
|
for use with mk[s]temp. Will fail (-1) if DIR is non-null and
|
|
doesn't exist, none of the searched dirs exists, or there's not
|
|
enough space in TMPL. */
|
|
int
|
|
__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
|
|
int try_tmpdir)
|
|
{
|
|
const char *d;
|
|
size_t dlen, plen;
|
|
|
|
if (!pfx || !pfx[0])
|
|
{
|
|
pfx = "file";
|
|
plen = 4;
|
|
}
|
|
else
|
|
{
|
|
plen = strlen (pfx);
|
|
if (plen > 5)
|
|
plen = 5;
|
|
}
|
|
|
|
if (try_tmpdir)
|
|
{
|
|
d = __secure_getenv ("TMPDIR");
|
|
if (d != NULL && direxists (d))
|
|
dir = d;
|
|
else if (dir != NULL && direxists (dir))
|
|
/* nothing */ ;
|
|
else
|
|
dir = NULL;
|
|
}
|
|
if (dir == NULL)
|
|
{
|
|
if (direxists (P_tmpdir))
|
|
dir = P_tmpdir;
|
|
else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
|
|
dir = "/tmp";
|
|
else
|
|
{
|
|
__set_errno (ENOENT);
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
dlen = strlen (dir);
|
|
while (dlen > 1 && dir[dlen - 1] == '/')
|
|
dlen--; /* remove trailing slashes */
|
|
|
|
/* check we have room for "${dir}/${pfx}XXXXXX\0" */
|
|
if (tmpl_len < dlen + 1 + plen + 6 + 1)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
|
|
return 0;
|
|
}
|
|
#endif /* _LIBC */
|
|
|
|
#if _LIBC
|
|
static int try_tempname_len (char *, int, void *, int (*) (char *, void *),
|
|
size_t);
|
|
#endif
|
|
|
|
static int
|
|
try_file (char *tmpl, void *flags)
|
|
{
|
|
int *openflags = flags;
|
|
return __open (tmpl,
|
|
(*openflags & ~O_ACCMODE)
|
|
| O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
|
|
}
|
|
|
|
static int
|
|
try_dir (char *tmpl, void *flags _GL_UNUSED)
|
|
{
|
|
return __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
|
|
}
|
|
|
|
static int
|
|
try_nocreate (char *tmpl, void *flags _GL_UNUSED)
|
|
{
|
|
struct_stat64 st;
|
|
|
|
if (__lxstat64 (_STAT_VER, tmpl, &st) == 0 || errno == EOVERFLOW)
|
|
__set_errno (EEXIST);
|
|
return errno == ENOENT ? 0 : -1;
|
|
}
|
|
|
|
/* These are the characters used in temporary file names. */
|
|
static const char letters[] =
|
|
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
|
|
|
|
/* Generate a temporary file name based on TMPL. TMPL must match the
|
|
rules for mk[s]temp (i.e., end in at least X_SUFFIX_LEN "X"s,
|
|
possibly with a suffix).
|
|
The name constructed does not exist at the time of the call to
|
|
this function. TMPL is overwritten with the result.
|
|
|
|
KIND may be one of:
|
|
__GT_NOCREATE: simply verify that the name does not exist
|
|
at the time of the call.
|
|
__GT_FILE: create the file using open(O_CREAT|O_EXCL)
|
|
and return a read-write fd. The file is mode 0600.
|
|
__GT_DIR: create a directory, which will be mode 0700.
|
|
|
|
We use a clever algorithm to get hard-to-predict names. */
|
|
#ifdef _LIBC
|
|
static
|
|
#endif
|
|
int
|
|
gen_tempname_len (char *tmpl, int suffixlen, int flags, int kind,
|
|
size_t x_suffix_len)
|
|
{
|
|
static int (*const tryfunc[]) (char *, void *) =
|
|
{
|
|
[__GT_FILE] = try_file,
|
|
[__GT_DIR] = try_dir,
|
|
[__GT_NOCREATE] = try_nocreate
|
|
};
|
|
return try_tempname_len (tmpl, suffixlen, &flags, tryfunc[kind],
|
|
x_suffix_len);
|
|
}
|
|
|
|
#ifdef _LIBC
|
|
static
|
|
#endif
|
|
int
|
|
try_tempname_len (char *tmpl, int suffixlen, void *args,
|
|
int (*tryfunc) (char *, void *), size_t x_suffix_len)
|
|
{
|
|
size_t len;
|
|
char *XXXXXX;
|
|
unsigned int count;
|
|
int fd = -1;
|
|
int save_errno = errno;
|
|
|
|
/* A lower bound on the number of temporary files to attempt to
|
|
generate. The maximum total number of temporary file names that
|
|
can exist for a given template is 62**6. It should never be
|
|
necessary to try all of these combinations. Instead if a reasonable
|
|
number of names is tried (we define reasonable as 62**3) fail to
|
|
give the system administrator the chance to remove the problems.
|
|
This value requires that X_SUFFIX_LEN be at least 3. */
|
|
#define ATTEMPTS_MIN (62 * 62 * 62)
|
|
|
|
/* The number of times to attempt to generate a temporary file. To
|
|
conform to POSIX, this must be no smaller than TMP_MAX. */
|
|
#if ATTEMPTS_MIN < TMP_MAX
|
|
unsigned int attempts = TMP_MAX;
|
|
#else
|
|
unsigned int attempts = ATTEMPTS_MIN;
|
|
#endif
|
|
|
|
/* A random variable. */
|
|
random_value v;
|
|
|
|
/* How many random base-62 digits can currently be extracted from V. */
|
|
int vdigits = 0;
|
|
|
|
/* Least unfair value for V. If V is less than this, V can generate
|
|
BASE_62_DIGITS digits fairly. Otherwise it might be biased. */
|
|
random_value const unfair_min
|
|
= RANDOM_VALUE_MAX - RANDOM_VALUE_MAX % BASE_62_POWER;
|
|
|
|
len = strlen (tmpl);
|
|
if (len < x_suffix_len + suffixlen
|
|
|| strspn (&tmpl[len - x_suffix_len - suffixlen], "X") < x_suffix_len)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
/* This is where the Xs start. */
|
|
XXXXXX = &tmpl[len - x_suffix_len - suffixlen];
|
|
|
|
for (count = 0; count < attempts; ++count)
|
|
{
|
|
for (size_t i = 0; i < x_suffix_len; i++)
|
|
{
|
|
if (vdigits == 0)
|
|
{
|
|
do
|
|
RANDOM_BITS (v);
|
|
while (unfair_min <= v);
|
|
|
|
vdigits = BASE_62_DIGITS;
|
|
}
|
|
|
|
XXXXXX[i] = letters[v % 62];
|
|
v /= 62;
|
|
vdigits--;
|
|
}
|
|
|
|
fd = tryfunc (tmpl, args);
|
|
if (fd >= 0)
|
|
{
|
|
__set_errno (save_errno);
|
|
return fd;
|
|
}
|
|
else if (errno != EEXIST)
|
|
return -1;
|
|
}
|
|
|
|
/* We got out of the loop because we ran out of combinations to try. */
|
|
__set_errno (EEXIST);
|
|
return -1;
|
|
}
|
|
|
|
int
|
|
__gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
|
|
{
|
|
return gen_tempname_len (tmpl, suffixlen, flags, kind, 6);
|
|
}
|
|
|
|
#if !_LIBC
|
|
int
|
|
try_tempname (char *tmpl, int suffixlen, void *args,
|
|
int (*tryfunc) (char *, void *))
|
|
{
|
|
return try_tempname_len (tmpl, suffixlen, args, tryfunc, 6);
|
|
}
|
|
#endif
|