2020-01-01 00:14:33 +00:00
|
|
|
/* Copyright (C) 1991-2020 Free Software Foundation, Inc.
|
1997-06-23 21:55:26 +00:00
|
|
|
This file is part of the GNU C Library.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-06-23 21:55:26 +00:00
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
2001-07-06 04:58:11 +00:00
|
|
|
modify it under the terms of the GNU Lesser General Public
|
|
|
|
License as published by the Free Software Foundation; either
|
|
|
|
version 2.1 of the License, or (at your option) any later version.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1997-06-23 21:55:26 +00:00
|
|
|
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
|
2001-07-06 04:58:11 +00:00
|
|
|
Lesser General Public License for more details.
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2001-07-06 04:58:11 +00:00
|
|
|
You should have received a copy of the GNU Lesser General Public
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2014-06-24 13:19:36 +00:00
|
|
|
#if !_LIBC
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
# include <config.h>
|
2014-06-24 13:19:36 +00:00
|
|
|
# include "tempname.h"
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
#endif
|
|
|
|
|
1995-02-18 01:27:10 +00:00
|
|
|
#include <sys/types.h>
|
1999-07-06 16:26:03 +00:00
|
|
|
#include <assert.h>
|
1995-02-18 01:27:10 +00:00
|
|
|
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
#include <errno.h>
|
|
|
|
#ifndef __set_errno
|
|
|
|
# define __set_errno(Val) errno = (Val)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#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
|
2007-08-11 02:48:28 +00:00
|
|
|
# define __GT_DIR 1
|
|
|
|
# define __GT_NOCREATE 2
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
#endif
|
2014-06-24 13:19:36 +00:00
|
|
|
#if !_LIBC && (GT_FILE != __GT_FILE || GT_DIR != __GT_DIR \
|
|
|
|
|| GT_NOCREATE != __GT_NOCREATE)
|
|
|
|
# error report this to bug-gnulib@gnu.org
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
#endif
|
|
|
|
|
2014-06-24 13:19:36 +00:00
|
|
|
#include <stddef.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
|
2014-06-24 13:19:36 +00:00
|
|
|
#include <fcntl.h>
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
#include <time.h>
|
2014-06-24 13:19:36 +00:00
|
|
|
#include <stdint.h>
|
|
|
|
#include <unistd.h>
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
|
|
|
|
#include <sys/stat.h>
|
|
|
|
|
|
|
|
#if _LIBC
|
|
|
|
# define struct_stat64 struct stat64
|
2014-06-24 13:19:36 +00:00
|
|
|
# define __secure_getenv __libc_secure_getenv
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
#else
|
|
|
|
# define struct_stat64 struct stat
|
2014-06-24 13:19:36 +00:00
|
|
|
# define __gen_tempname gen_tempname
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
# define __getpid getpid
|
|
|
|
# define __mkdir mkdir
|
|
|
|
# define __open open
|
2014-06-24 13:19:36 +00:00
|
|
|
# define __lxstat64(version, file, buf) lstat (file, buf)
|
|
|
|
# define __secure_getenv secure_getenv
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
#endif
|
|
|
|
|
2001-04-23 19:01:10 +00:00
|
|
|
#ifdef _LIBC
|
2019-01-16 18:10:56 +00:00
|
|
|
# include <random-bits.h>
|
|
|
|
# define RANDOM_BITS(Var) ((Var) = random_bits ())
|
|
|
|
# else
|
|
|
|
# define RANDOM_BITS(Var) \
|
|
|
|
{ \
|
Change most internal uses of __gettimeofday to __clock_gettime.
Since gettimeofday will shortly be implemented in terms of
clock_gettime on all platforms, internal code should use clock_gettime
directly; in addition to removing a layer of indirection, this will
allow us to remove the PLT-bypass gunk for gettimeofday. (We can't
quite do that yet, but it'll be coming later in this patch series.)
In many cases, the changed code does fewer conversions.
The changed code always assumes __clock_gettime (CLOCK_REALTIME)
cannot fail. Most of the call sites were assuming gettimeofday could
not fail, but a few places were checking for errors. POSIX says
clock_gettime can only fail if the clock constant is invalid or
unsupported, and CLOCK_REALTIME is the one and only clock constant
that's required to be supported. For consistency I grepped the entire
source tree for any other places that checked for errors from
__clock_gettime (CLOCK_REALTIME), found one, and changed it too.
(For the record, POSIX also says gettimeofday can never fail.)
(It would be nice if we could declare that GNU systems will always
support CLOCK_MONOTONIC as well as CLOCK_REALTIME; there are several
places where we are using CLOCK_REALTIME where _MONOTONIC would be
more appropriate, and/or trying to use _MONOTONIC and then falling
back to _REALTIME. But the Hurd doesn't support CLOCK_MONOTONIC yet,
and it looks like adding it would involve substantial changes to
gnumach's internals and API. Oh well.)
A few Hurd-specific files were changed to use __host_get_time instead
of __clock_gettime, as this seemed tidier. We also assume this cannot
fail. Skimming the code in gnumach leads me to believe the only way
it could fail is if __mach_host_self also failed, and our
Hurd-specific code consistently assumes that can't happen, so I'm
going with that.
With the exception of support/support_test_main.c, test cases are not
modified, mainly because I didn't want to have to figure out which
test cases were testing gettimeofday specifically.
The definition of GETTIME in sysdeps/generic/memusage.h had a typo and
was not reading tv_sec at all. I fixed this. It appears nobody has been
generating malloc traces on a machine that doesn't have a superseding
definition.
There are a whole bunch of places where the code could be simplified
by factoring out timespec subtraction and/or comparison logic, but I
want to keep this patch as mechanical as possible.
Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc64le-linux-gnu,
powerpc64-linux-gnu, powerpc-linux-gnu, and aarch64-linux-gnu.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
2019-08-17 00:38:22 +00:00
|
|
|
struct timespec ts; \
|
|
|
|
clock_gettime (CLOCK_REALTIME, &ts); \
|
|
|
|
(Var) = ((uint64_t) tv.tv_nsec << 16) ^ tv.tv_sec; \
|
2019-01-16 18:10:56 +00:00
|
|
|
}
|
2001-04-23 19:01:10 +00:00
|
|
|
#endif
|
|
|
|
|
2001-03-19 23:34:54 +00:00
|
|
|
/* Use the widest available unsigned type if uint64_t is not
|
|
|
|
available. The algorithm below extracts a number less than 62**6
|
|
|
|
(approximately 2**35.725) from uint64_t, so ancient hosts where
|
|
|
|
uintmax_t is only 32 bits lose about 3.725 bits of randomness,
|
|
|
|
which is better than not having mkstemp at all. */
|
|
|
|
#if !defined UINT64_MAX && !defined uint64_t
|
|
|
|
# define uint64_t uintmax_t
|
|
|
|
#endif
|
|
|
|
|
2014-06-24 13:19:36 +00:00
|
|
|
#if _LIBC
|
1995-02-18 01:27:10 +00:00
|
|
|
/* Return nonzero if DIR is an existent directory. */
|
|
|
|
static int
|
1998-08-03 16:47:01 +00:00
|
|
|
direxists (const char *dir)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
struct_stat64 buf;
|
2000-09-01 02:26:05 +00:00
|
|
|
return __xstat64 (_STAT_VER, dir, &buf) == 0 && S_ISDIR (buf.st_mode);
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
|
1998-08-03 16:47:01 +00:00
|
|
|
/* 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
|
1998-12-14 15:23:56 +00:00
|
|
|
__path_search (char *tmpl, size_t tmpl_len, const char *dir, const char *pfx,
|
|
|
|
int try_tmpdir)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
1998-08-03 16:47:01 +00:00
|
|
|
const char *d;
|
|
|
|
size_t dlen, plen;
|
|
|
|
|
|
|
|
if (!pfx || !pfx[0])
|
|
|
|
{
|
|
|
|
pfx = "file";
|
|
|
|
plen = 4;
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
else
|
|
|
|
{
|
1998-08-03 16:47:01 +00:00
|
|
|
plen = strlen (pfx);
|
|
|
|
if (plen > 5)
|
|
|
|
plen = 5;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
|
1998-12-14 15:23:56 +00:00
|
|
|
if (try_tmpdir)
|
|
|
|
{
|
2014-06-24 13:19:36 +00:00
|
|
|
d = __secure_getenv ("TMPDIR");
|
1998-12-14 15:23:56 +00:00
|
|
|
if (d != NULL && direxists (d))
|
|
|
|
dir = d;
|
|
|
|
else if (dir != NULL && direxists (dir))
|
|
|
|
/* nothing */ ;
|
1998-12-15 09:31:30 +00:00
|
|
|
else
|
|
|
|
dir = NULL;
|
1998-12-14 15:23:56 +00:00
|
|
|
}
|
1998-12-15 16:47:38 +00:00
|
|
|
if (dir == NULL)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
1998-12-15 00:02:24 +00:00
|
|
|
if (direxists (P_tmpdir))
|
|
|
|
dir = P_tmpdir;
|
|
|
|
else if (strcmp (P_tmpdir, "/tmp") != 0 && direxists ("/tmp"))
|
|
|
|
dir = "/tmp";
|
|
|
|
else
|
|
|
|
{
|
|
|
|
__set_errno (ENOENT);
|
|
|
|
return -1;
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
dlen = strlen (dir);
|
|
|
|
while (dlen > 1 && dir[dlen - 1] == '/')
|
1998-08-03 16:47:01 +00:00
|
|
|
dlen--; /* remove trailing slashes */
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1998-08-03 16:47:01 +00:00
|
|
|
/* check we have room for "${dir}/${pfx}XXXXXX\0" */
|
|
|
|
if (tmpl_len < dlen + 1 + plen + 6 + 1)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
1998-08-03 16:47:01 +00:00
|
|
|
__set_errno (EINVAL);
|
|
|
|
return -1;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
|
1998-12-17 06:41:01 +00:00
|
|
|
sprintf (tmpl, "%.*s/%.*sXXXXXX", (int) dlen, dir, (int) plen, pfx);
|
1998-08-03 16:47:01 +00:00
|
|
|
return 0;
|
|
|
|
}
|
2014-06-24 13:19:36 +00:00
|
|
|
#endif /* _LIBC */
|
1998-08-03 16:47:01 +00:00
|
|
|
|
2014-06-24 13:19:36 +00:00
|
|
|
/* These are the characters used in temporary file names. */
|
1998-08-03 16:47:01 +00:00
|
|
|
static const char letters[] =
|
|
|
|
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
|
|
|
|
|
|
|
|
/* Generate a temporary file name based on TMPL. TMPL must match the
|
2009-10-30 07:11:07 +00:00
|
|
|
rules for mk[s]temp (i.e. end in "XXXXXX", possibly with a suffix).
|
|
|
|
The name constructed does not exist at the time of the call to
|
|
|
|
__gen_tempname. TMPL is overwritten with the result.
|
1999-07-06 16:26:03 +00:00
|
|
|
|
|
|
|
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.
|
1998-08-03 16:47:01 +00:00
|
|
|
|
|
|
|
We use a clever algorithm to get hard-to-predict names. */
|
|
|
|
int
|
2009-10-30 07:11:07 +00:00
|
|
|
__gen_tempname (char *tmpl, int suffixlen, int flags, int kind)
|
1998-08-03 16:47:01 +00:00
|
|
|
{
|
|
|
|
int len;
|
|
|
|
char *XXXXXX;
|
2001-11-27 03:47:06 +00:00
|
|
|
unsigned int count;
|
|
|
|
int fd = -1;
|
1998-08-03 16:47:01 +00:00
|
|
|
int save_errno = errno;
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
struct_stat64 st;
|
1995-02-18 01:27:10 +00:00
|
|
|
|
2001-11-27 03:47:06 +00:00
|
|
|
/* 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
|
2014-06-24 13:19:36 +00:00
|
|
|
necessary to try all of these combinations. Instead if a reasonable
|
2001-11-27 03:47:06 +00:00
|
|
|
number of names is tried (we define reasonable as 62**3) fail to
|
|
|
|
give the system administrator the chance to remove the problems. */
|
2006-04-07 20:25:36 +00:00
|
|
|
#define ATTEMPTS_MIN (62 * 62 * 62)
|
2001-11-27 03:47:06 +00:00
|
|
|
|
|
|
|
/* The number of times to attempt to generate a temporary file. To
|
|
|
|
conform to POSIX, this must be no smaller than TMP_MAX. */
|
2006-04-07 20:25:36 +00:00
|
|
|
#if ATTEMPTS_MIN < TMP_MAX
|
|
|
|
unsigned int attempts = TMP_MAX;
|
|
|
|
#else
|
|
|
|
unsigned int attempts = ATTEMPTS_MIN;
|
|
|
|
#endif
|
2001-11-27 03:47:06 +00:00
|
|
|
|
1998-08-03 16:47:01 +00:00
|
|
|
len = strlen (tmpl);
|
2009-10-30 07:11:07 +00:00
|
|
|
if (len < 6 + suffixlen || memcmp (&tmpl[len - 6 - suffixlen], "XXXXXX", 6))
|
1998-08-03 16:47:01 +00:00
|
|
|
{
|
1998-07-22 16:54:32 +00:00
|
|
|
__set_errno (EINVAL);
|
1998-08-03 16:47:01 +00:00
|
|
|
return -1;
|
|
|
|
}
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1998-08-03 16:47:01 +00:00
|
|
|
/* This is where the Xs start. */
|
2009-10-30 07:11:07 +00:00
|
|
|
XXXXXX = &tmpl[len - 6 - suffixlen];
|
1996-09-28 03:24:10 +00:00
|
|
|
|
2019-07-25 14:22:17 +00:00
|
|
|
uint64_t pid = (uint64_t) __getpid () << 32;
|
|
|
|
for (count = 0; count < attempts; ++count)
|
1998-07-22 16:54:32 +00:00
|
|
|
{
|
2019-07-25 14:22:17 +00:00
|
|
|
uint64_t v;
|
|
|
|
/* Get some more or less random data. */
|
|
|
|
RANDOM_BITS (v);
|
|
|
|
v ^= pid;
|
1998-07-22 16:54:32 +00:00
|
|
|
|
|
|
|
/* Fill in the random bits. */
|
|
|
|
XXXXXX[0] = letters[v % 62];
|
|
|
|
v /= 62;
|
|
|
|
XXXXXX[1] = letters[v % 62];
|
|
|
|
v /= 62;
|
|
|
|
XXXXXX[2] = letters[v % 62];
|
|
|
|
v /= 62;
|
|
|
|
XXXXXX[3] = letters[v % 62];
|
|
|
|
v /= 62;
|
|
|
|
XXXXXX[4] = letters[v % 62];
|
|
|
|
v /= 62;
|
|
|
|
XXXXXX[5] = letters[v % 62];
|
1995-02-18 01:27:10 +00:00
|
|
|
|
1999-07-06 16:26:03 +00:00
|
|
|
switch (kind)
|
1998-08-03 16:47:01 +00:00
|
|
|
{
|
1999-07-06 16:26:03 +00:00
|
|
|
case __GT_FILE:
|
2007-08-11 02:48:28 +00:00
|
|
|
fd = __open (tmpl,
|
2008-03-30 03:30:38 +00:00
|
|
|
(flags & ~O_ACCMODE)
|
2007-08-11 02:48:28 +00:00
|
|
|
| O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR);
|
1999-07-06 16:26:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case __GT_DIR:
|
Update.
2001-02-26 Paul Eggert <eggert@twinsun.com>
Modify mkstemp.c and tempname.c so that they can be used by
GNU applications on non-glibc platforms.
* misc/mkstemp.c (__GT_FILE): Define to zero if not defined.
* sysdeps/posix/tempname.c: Include <config.h> if HAVE_CONFIG_H.
Include <stddef.h>, <stdint.h>, <string.h> only if
STDC_HEADERS || _LIBC.
Include <fcntl.h> only if HAVE_FCNTL_H || _LIBC.
Include <unistd.h> only if HAVE_UNISTD_H || _LIBC.
Include <sys/time.h> only if HAVE_SYS_TIME_H || _LIBC.
(__set_errno): Define this macro if <errno.h> doesn't.
(P_tmpdir, TMP_MAX, __GT_FILE, __GT_BIGFILE, __GT_DIR, __GT_NOCREATE):
Define these macros if <stdio.h> doesn't.
(S_ISDIR, S_IRUSR, S_IWUSR, S_IXUSR):
Define these macros if <sys/stat.h> doesn't.
Ignore <sys/stat.h> S_ISDIR if STAT_MACROS_BROKEN.
(stat64, __getpid, __gettimeofday, __mkdir, __open, __open64,
lxstat64, __xstat64): Define if not _LIBC.
(struct_stat64): New macro.
(direxists, __gen_tempname): Use it, to avoid a
portability problem with Solaris 8.
(__secure_getenv): Define if ! (HAVE___SECURE_GETENV || _LIBC).
(__gen_tempname): Invoke gettimeofday only if
HAVE_GETTIMEOFDAY || _LIBC; otherwise, fall back on plain "time".
Use portable macros like S_IRUSR | S_IWUSR rather than nonportable
octal values like 0600.
2001-02-27 01:59:46 +00:00
|
|
|
fd = __mkdir (tmpl, S_IRUSR | S_IWUSR | S_IXUSR);
|
1999-07-06 16:26:03 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case __GT_NOCREATE:
|
|
|
|
/* This case is backward from the other three. __gen_tempname
|
|
|
|
succeeds if __xstat fails because the name does not exist.
|
|
|
|
Note the continue to bypass the common logic at the bottom
|
|
|
|
of the loop. */
|
2000-09-11 16:06:52 +00:00
|
|
|
if (__lxstat64 (_STAT_VER, tmpl, &st) < 0)
|
1998-08-03 16:47:01 +00:00
|
|
|
{
|
|
|
|
if (errno == ENOENT)
|
1995-02-18 01:27:10 +00:00
|
|
|
{
|
1998-08-03 16:47:01 +00:00
|
|
|
__set_errno (save_errno);
|
|
|
|
return 0;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
1998-08-03 16:47:01 +00:00
|
|
|
else
|
|
|
|
/* Give up now. */
|
|
|
|
return -1;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
1999-07-06 16:26:03 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
default:
|
|
|
|
assert (! "invalid KIND in __gen_tempname");
|
2014-06-24 13:19:36 +00:00
|
|
|
abort ();
|
1999-07-06 16:26:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fd >= 0)
|
|
|
|
{
|
|
|
|
__set_errno (save_errno);
|
|
|
|
return fd;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
1999-07-06 16:26:03 +00:00
|
|
|
else if (errno != EEXIST)
|
|
|
|
return -1;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* We got out of the loop because we ran out of combinations to try. */
|
1998-08-03 16:47:01 +00:00
|
|
|
__set_errno (EEXIST);
|
|
|
|
return -1;
|
1995-02-18 01:27:10 +00:00
|
|
|
}
|