Commit 72fad885 authored by Paul Eggert's avatar Paul Eggert

Update from Gnulib

This incorporates:
2018-03-26 time_rz: work around Mac OS X 10.6 infloop
2018-03-20 euidaccess: Port to native Windows.
* lib/euidaccess.c, lib/time_rz.c, m4/time_rz.m4: Copy from Gnulib.
parent 7bc31c1c
......@@ -29,8 +29,11 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include "root-uid.h"
#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# include <io.h>
#else
# include "root-uid.h"
#endif
#if HAVE_LIBGEN_H
# include <libgen.h>
......@@ -84,7 +87,9 @@ euidaccess (const char *file, int mode)
return accessx (file, mode, ACC_SELF);
#elif HAVE_EACCESS /* FreeBSD */
return eaccess (file, mode);
#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, mingw, BeOS */
#elif (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ /* mingw */
return _access (file, mode);
#else /* Mac OS X, NetBSD, OpenBSD, HP-UX, Solaris, Cygwin, BeOS */
uid_t uid = getuid ();
gid_t gid = getgid ();
......
......@@ -286,6 +286,21 @@ revert_tz (timezone_t tz)
struct tm *
localtime_rz (timezone_t tz, time_t const *t, struct tm *tm)
{
#ifdef HAVE_LOCALTIME_INFLOOP_BUG
/* The -67768038400665599 comes from:
https://lists.gnu.org/r/bug-gnulib/2017-07/msg00142.html
On affected platforms the greatest POSIX-compatible time_t value
that could return nonnull is 67768036191766798 (when
TZ="XXX24:59:59" it resolves to the year 2**31 - 1 + 1900, on
12-31 at 23:59:59), so test for that too while we're in the
neighborhood. */
if (! (-67768038400665599 <= *t && *t <= 67768036191766798))
{
errno = EOVERFLOW;
return NULL;
}
#endif
if (!tz)
return gmtime_r (t, tm);
else
......
......@@ -13,6 +13,38 @@ AC_DEFUN([gl_TIME_RZ],
AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS])
AC_REQUIRE([AC_STRUCT_TIMEZONE])
# Mac OS X 10.6 loops forever with some time_t values less
# than -67768038400665599. See Bug#27706, Bug#27736, and
# https://lists.gnu.org/r/bug-gnulib/2017-07/msg00142.html
AC_CACHE_CHECK([whether localtime loops forever near extrema],
[gl_cv_func_localtime_infloop_bug],
[gl_cv_func_localtime_infloop_bug=no
AC_RUN_IFELSE(
[AC_LANG_PROGRAM(
[[#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <time.h>
]], [[
time_t t = -67768038400665600;
struct tm *tm;
char *tz = getenv ("TZ");
if (! (tz && strcmp (tz, "QQQ0") == 0))
return 0;
alarm (2);
tm = localtime (&t);
/* Use TM and *TM to suppress over-optimization. */
return tm && tm->tm_isdst;
]])],
[TZ=QQQ0 ./conftest$EXEEXT || gl_cv_func_localtime_infloop_bug=yes],
[],
[gl_cv_func_localtime_infloop_bug="guessing no"])])
if test "$gl_cv_func_localtime_infloop_bug" = yes; then
AC_DEFINE([HAVE_LOCALTIME_INFLOOP_BUG], 1,
[Define if localtime-like functions can loop forever on
extreme arguments.])
fi
AC_CHECK_TYPES([timezone_t], [], [], [[#include <time.h>]])
if test "$ac_cv_type_timezone_t" = yes; then
HAVE_TIMEZONE_T=1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment