lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Hurd: Fix ftime build

Browse Source 
It does not provide __clock_gettime64, the ftime y2038 support is
moved to a Linux specific implementation.

Checked with a build for i686-linux-gnu and on x86_64-linux and
i686-linux-gnu.
This commit is contained in:
Adhemerval Zanella
2020-10-27 15:21:50 -03:00
parent b94cc191e0
commit 641a124845
2 changed files with 58 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
sysdeps/unix/sysv/linux/ftime.c Normal file
View File

@ -0,0 +1,54 @@
/* Deprecated return date and time. Linux version.
Copyright (C) 1994-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 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.
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
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <features.h>
#include <sys/timeb.h>
#include <errno.h>
int
__ftime64 (struct __timeb64 *timebuf)
{
struct __timespec64 ts;
__clock_gettime64 (CLOCK_REALTIME, &ts);
timebuf->time = ts.tv_sec;
timebuf->millitm = ts.tv_nsec / 1000000;
timebuf->timezone = 0;
timebuf->dstflag = 0;
return 0;
}
#if __TIMESIZE != 64
libc_hidden_def (__ftime64)
int
ftime (struct timeb *timebuf)
{
struct __timeb64 tb64;
__ftime64 (&tb64);
if (! in_time_t_range (tb64.time))
{
__set_errno (EOVERFLOW);
return -1;
}
timebuf->time = tb64.time;
timebuf->millitm = tb64.millitm;
timebuf->timezone = tb64.timezone;
timebuf->dstflag = tb64.dstflag;
return 0;
}
#endif

29
time/ftime.c
View File

@ -16,15 +16,14 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <features.h>
#include <sys/timeb.h> #include <sys/timeb.h>
#include <errno.h> #include <time.h>
int int
__ftime64 (struct __timeb64 *timebuf) ftime (struct timeb *timebuf)
{ {
struct __timespec64 ts; struct timespec ts;
__clock_gettime64 (CLOCK_REALTIME, &ts); __clock_gettime (CLOCK_REALTIME, &ts);
timebuf->time = ts.tv_sec; timebuf->time = ts.tv_sec;
timebuf->millitm = ts.tv_nsec / 1000000; timebuf->millitm = ts.tv_nsec / 1000000;
@ -32,23 +31,3 @@ __ftime64 (struct __timeb64 *timebuf)
timebuf->dstflag = 0; timebuf->dstflag = 0;
return 0; return 0;
} }
#if __TIMESIZE != 64
libc_hidden_def (__ftime64)
int
ftime (struct timeb *timebuf)
{
struct __timeb64 tb64;
__ftime64 (&tb64);
if (! in_time_t_range (tb64.time))
{
__set_errno (EOVERFLOW);
return -1;
}
timebuf->time = tb64.time;
timebuf->millitm = tb64.millitm;
timebuf->timezone = tb64.timezone;
timebuf->dstflag = tb64.dstflag;
return 0;
}
#endif