4a626d0a0f
2015-08-24 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 1029a8112290f6eee9d7878a391c49db42c999bd. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/basename-lgpl.c: Update. * gnulib/import/canonicalize-lgpl.c: Update. * gnulib/import/config.charset: Update. * gnulib/import/dirent.in.h: Update. * gnulib/import/dirfd.c: Update. * gnulib/import/dirname-lgpl.c: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno.in.h: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/float+.h: Update. * gnulib/import/float.c: Update. * gnulib/import/float.in.h: Update. * gnulib/import/fnmatch.c: Update. * gnulib/import/fnmatch.in.h: Update. * gnulib/import/fnmatch_loop.c: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp.c: Update. * gnulib/import/frexpl.c: Update. * gnulib/import/gettimeofday.c: Update. * gnulib/import/inttypes.in.h: Update. * gnulib/import/isnan.c: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand.c: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl.c: Update. * gnulib/import/itold.c: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat.c: Update. * gnulib/import/m4/00gnulib.m4: Update. * gnulib/import/m4/absolute-header.m4: Update. * gnulib/import/m4/alloca.m4: Update. * gnulib/import/m4/canonicalize.m4: Update. * gnulib/import/m4/codeset.m4: Update. * gnulib/import/m4/configmake.m4: Update. * gnulib/import/m4/dirent_h.m4: Update. * gnulib/import/m4/dirfd.m4: Update. * gnulib/import/m4/dirname.m4: Update. * gnulib/import/m4/double-slash-root.m4: Update. * gnulib/import/m4/eealloc.m4: Update. * gnulib/import/m4/errno_h.m4: Update. * gnulib/import/m4/exponentd.m4: Update. * gnulib/import/m4/exponentl.m4: Update. * gnulib/import/m4/extensions.m4: Update. * gnulib/import/m4/extern-inline.m4: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/float_h.m4: Update. * gnulib/import/m4/fnmatch.m4: Update. * gnulib/import/m4/fpieee.m4: Update. * gnulib/import/m4/frexp.m4: Update. * gnulib/import/m4/frexpl.m4: Update. * gnulib/import/m4/gettimeofday.m4: Update. * gnulib/import/m4/glibc21.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-common.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/gnulib-tool.m4: Update. * gnulib/import/m4/include_next.m4: Update. * gnulib/import/m4/inttypes-pri.m4: Update. * gnulib/import/m4/inttypes.m4: Update. * gnulib/import/m4/isnand.m4: Update. * gnulib/import/m4/isnanl.m4: Update. * gnulib/import/m4/largefile.m4: Update. * gnulib/import/m4/localcharset.m4: Update. * gnulib/import/m4/locale-fr.m4: Update. * gnulib/import/m4/locale-ja.m4: Update. * gnulib/import/m4/locale-zh.m4: Update. * gnulib/import/m4/longlong.m4: Update. * gnulib/import/m4/lstat.m4: Update. * gnulib/import/m4/malloc.m4: Update. * gnulib/import/m4/malloca.m4: Update. * gnulib/import/m4/math_h.m4: Update. * gnulib/import/m4/mbrtowc.m4: Update. * gnulib/import/m4/mbsinit.m4: Update. * gnulib/import/m4/mbsrtowcs.m4: Update. * gnulib/import/m4/mbstate_t.m4: Update. * gnulib/import/m4/memchr.m4: Update. * gnulib/import/m4/memmem.m4: Update. * gnulib/import/m4/mmap-anon.m4: Update. * gnulib/import/m4/multiarch.m4: Update. * gnulib/import/m4/nocrash.m4: Update. * gnulib/import/m4/off_t.m4: Update. * gnulib/import/m4/pathmax.m4: Update. * gnulib/import/m4/readlink.m4: Update. * gnulib/import/m4/rename.m4: Update. * gnulib/import/m4/rmdir.m4: Update. * gnulib/import/m4/ssize_t.m4: Update. * gnulib/import/m4/stat.m4: Update. * gnulib/import/m4/stdbool.m4: Update. * gnulib/import/m4/stddef_h.m4: Update. * gnulib/import/m4/stdint.m4: Update. * gnulib/import/m4/stdio_h.m4: Update. * gnulib/import/m4/stdlib_h.m4: Update. * gnulib/import/m4/string_h.m4: Update. * gnulib/import/m4/strstr.m4: Update. * gnulib/import/m4/strtok_r.m4: Update. * gnulib/import/m4/sys_socket_h.m4: Update. * gnulib/import/m4/sys_stat_h.m4: Update. * gnulib/import/m4/sys_time_h.m4: Update. * gnulib/import/m4/sys_types_h.m4: Update. * gnulib/import/m4/time_h.m4: Update. * gnulib/import/m4/unistd_h.m4: Update. * gnulib/import/m4/warn-on-use.m4: Update. * gnulib/import/m4/wchar_h.m4: Update. * gnulib/import/m4/wchar_t.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/m4/wint_t.m4: Update. * gnulib/import/malloc.c: Update. * gnulib/import/malloca.c: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math.in.h: Update. * gnulib/import/mbrtowc.c: Update. * gnulib/import/mbsinit.c: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state.c: Update. * gnulib/import/mbsrtowcs.c: Update. * gnulib/import/memchr.c: Update. * gnulib/import/memmem.c: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/readlink.c: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename.c: Update. * gnulib/import/rmdir.c: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/stat.c: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/stddef.in.h: Update. * gnulib/import/stdint.in.h: Update. * gnulib/import/stdio.c: Update. * gnulib/import/stdio.in.h: Update. * gnulib/import/stdlib.in.h: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/streq.h: Update. * gnulib/import/string.in.h: Update. * gnulib/import/stripslash.c: Update. * gnulib/import/strnlen1.c: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr.c: Update. * gnulib/import/strtok_r.c: Update. * gnulib/import/sys_stat.in.h: Update. * gnulib/import/sys_time.in.h: Update. * gnulib/import/sys_types.in.h: Update. * gnulib/import/time.in.h: Update. * gnulib/import/unistd.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar.in.h: Update. * gnulib/import/wctype.in.h: Update. * gnulib/import/gettimeofday.c: New file. * gnulib/import/m4/absolute-header.m4: New file. * gnulib/import/m4/gettimeofday.m4: New file. * gnulib/import/m4/sys_socket_h.m4: New file. * gnulib/import/m4/sys_time_h.m4: New file. * gnulib/import/stdio.c: Delete file. * gnulib/import/sys_time.in.h: New file.
154 lines
4 KiB
C
154 lines
4 KiB
C
/* Provide gettimeofday for systems that don't have it or for which it's broken.
|
|
|
|
Copyright (C) 2001-2003, 2005-2007, 2009-2015 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, 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 <http://www.gnu.org/licenses/>. */
|
|
|
|
/* written by Jim Meyering */
|
|
|
|
#include <config.h>
|
|
|
|
/* Specification. */
|
|
#include <sys/time.h>
|
|
|
|
#include <time.h>
|
|
|
|
#if HAVE_SYS_TIMEB_H
|
|
# include <sys/timeb.h>
|
|
#endif
|
|
|
|
#if GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME
|
|
|
|
/* Work around the bug in some systems whereby gettimeofday clobbers
|
|
the static buffer that localtime uses for its return value. The
|
|
gettimeofday function from Mac OS X 10.0.4 (i.e., Darwin 1.3.7) has
|
|
this problem. The tzset replacement is necessary for at least
|
|
Solaris 2.5, 2.5.1, and 2.6. */
|
|
|
|
static struct tm tm_zero_buffer;
|
|
static struct tm *localtime_buffer_addr = &tm_zero_buffer;
|
|
|
|
# undef localtime
|
|
extern struct tm *localtime (time_t const *);
|
|
|
|
# undef gmtime
|
|
extern struct tm *gmtime (time_t const *);
|
|
|
|
/* This is a wrapper for localtime. It is used only on systems for which
|
|
gettimeofday clobbers the static buffer used for localtime's result.
|
|
|
|
On the first call, record the address of the static buffer that
|
|
localtime uses for its result. */
|
|
|
|
struct tm *
|
|
rpl_localtime (time_t const *timep)
|
|
{
|
|
struct tm *tm = localtime (timep);
|
|
|
|
if (localtime_buffer_addr == &tm_zero_buffer)
|
|
localtime_buffer_addr = tm;
|
|
|
|
return tm;
|
|
}
|
|
|
|
/* Same as above, since gmtime and localtime use the same buffer. */
|
|
struct tm *
|
|
rpl_gmtime (time_t const *timep)
|
|
{
|
|
struct tm *tm = gmtime (timep);
|
|
|
|
if (localtime_buffer_addr == &tm_zero_buffer)
|
|
localtime_buffer_addr = tm;
|
|
|
|
return tm;
|
|
}
|
|
|
|
#endif /* GETTIMEOFDAY_CLOBBERS_LOCALTIME || TZSET_CLOBBERS_LOCALTIME */
|
|
|
|
#if TZSET_CLOBBERS_LOCALTIME
|
|
|
|
# undef tzset
|
|
extern void tzset (void);
|
|
|
|
/* This is a wrapper for tzset, for systems on which tzset may clobber
|
|
the static buffer used for localtime's result. */
|
|
void
|
|
rpl_tzset (void)
|
|
{
|
|
/* Save and restore the contents of the buffer used for localtime's
|
|
result around the call to tzset. */
|
|
struct tm save = *localtime_buffer_addr;
|
|
tzset ();
|
|
*localtime_buffer_addr = save;
|
|
}
|
|
#endif
|
|
|
|
/* This is a wrapper for gettimeofday. It is used only on systems
|
|
that lack this function, or whose implementation of this function
|
|
causes problems. */
|
|
|
|
int
|
|
gettimeofday (struct timeval *restrict tv, void *restrict tz)
|
|
{
|
|
#undef gettimeofday
|
|
#if HAVE_GETTIMEOFDAY
|
|
# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
|
|
/* Save and restore the contents of the buffer used for localtime's
|
|
result around the call to gettimeofday. */
|
|
struct tm save = *localtime_buffer_addr;
|
|
# endif
|
|
|
|
# if defined timeval /* 'struct timeval' overridden by gnulib? */
|
|
# undef timeval
|
|
struct timeval otv;
|
|
int result = gettimeofday (&otv, (struct timezone *) tz);
|
|
if (result == 0)
|
|
{
|
|
tv->tv_sec = otv.tv_sec;
|
|
tv->tv_usec = otv.tv_usec;
|
|
}
|
|
# else
|
|
int result = gettimeofday (tv, (struct timezone *) tz);
|
|
# endif
|
|
|
|
# if GETTIMEOFDAY_CLOBBERS_LOCALTIME
|
|
*localtime_buffer_addr = save;
|
|
# endif
|
|
|
|
return result;
|
|
|
|
#else
|
|
|
|
# if HAVE__FTIME
|
|
|
|
struct _timeb timebuf;
|
|
_ftime (&timebuf);
|
|
tv->tv_sec = timebuf.time;
|
|
tv->tv_usec = timebuf.millitm * 1000;
|
|
|
|
# else
|
|
|
|
# if !defined OK_TO_USE_1S_CLOCK
|
|
# error "Only 1-second nominal clock resolution found. Is that intended?" \
|
|
"If so, compile with the -DOK_TO_USE_1S_CLOCK option."
|
|
# endif
|
|
tv->tv_sec = time (NULL);
|
|
tv->tv_usec = 0;
|
|
|
|
# endif
|
|
|
|
return 0;
|
|
|
|
#endif
|
|
}
|