diff options
author | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2017-09-08 00:42:13 +0200 |
---|---|---|
committer | Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr> | 2018-02-01 12:15:50 +0100 |
commit | a664ccb656427bb9716d773e9af34223c70e6e95 (patch) | |
tree | 7ce41f055fd25bc86bb70660f9cc10000cef7b35 | |
parent | ead40aa24868e39d79e941e0a7e3bc29d8865de9 (diff) | |
download | glibc-a664ccb656427bb9716d773e9af34223c70e6e95.tar.gz |
Y2038: add function __ntp_gettime_t64
-rw-r--r-- | sysdeps/unix/sysv/linux/Versions | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ntp_gettime.c | 25 |
2 files changed, 26 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index 336c13b57d..59b8964b7c 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -170,6 +170,7 @@ libc { memfd_create; mlock2; pkey_alloc; pkey_free; pkey_set; pkey_get; pkey_mprotect; + __ntp_gettime_t64; } GLIBC_PRIVATE { # functions used in other libraries diff --git a/sysdeps/unix/sysv/linux/ntp_gettime.c b/sysdeps/unix/sysv/linux/ntp_gettime.c index 18650da94c..2b7dc7c98e 100644 --- a/sysdeps/unix/sysv/linux/ntp_gettime.c +++ b/sysdeps/unix/sysv/linux/ntp_gettime.c @@ -18,6 +18,7 @@ #define ntp_gettime ntp_gettime_redirect #include <sys/timex.h> +#include <include/time.h> #undef ntp_gettime @@ -39,3 +40,27 @@ ntp_gettime (struct ntptimeval *ntv) ntv->esterror = tntx.esterror; return result; } + +/* The 64-bit-time version */ + +extern int __y2038_linux_support; + +int +__ntp_gettime_t64 (struct __ntptimeval_t64 *ntv) +{ + struct timex tntx; + int result; + + if (__y2038_linux_support) + { + // TODO: use 64-bit syscall if possible + } + + tntx.modes = 0; + result = __adjtimex (&tntx); + ntv->time.tv_sec = tntx.time.tv_sec; + ntv->time.tv_usec = tntx.time.tv_usec; + ntv->maxerror = tntx.maxerror; + ntv->esterror = tntx.esterror; + return result; +} |