From 2c2c3605d3b3ff32902c406d17ac44e7544be4e2 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Sat, 27 Jul 2019 17:48:32 -0400 Subject: [PATCH] implement settimeofday in terms of clock_settime, not old syscall this is yet another place where special handling of time syscalls can and should be avoided by implementing legacy functions in terms of their modern replacements. in theory a fallback to SYS_settimeofday could be added to clock_settime, but SYS_clock_settime has been available since Linux 2.6.0 or earlier, i.e. all the way back to the minimum supported version. --- src/linux/settimeofday.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/linux/settimeofday.c b/src/linux/settimeofday.c index 15c18c63..860fb5de 100644 --- a/src/linux/settimeofday.c +++ b/src/linux/settimeofday.c @@ -1,8 +1,13 @@ #define _BSD_SOURCE #include +#include +#include #include "syscall.h" int settimeofday(const struct timeval *tv, const struct timezone *tz) { - return syscall(SYS_settimeofday, tv, 0); + if (!tv) return 0; + if (tv->tv_usec >= 1000000ULL) return __syscall_ret(-EINVAL); + return clock_settime(CLOCK_REALTIME, &((struct timespec){ + .tv_sec = tv->tv_sec, .tv_nsec = tv->tv_usec * 1000})); } -- 2.25.1