diff options
| author | Denys Vlasenko | 2019-10-24 16:26:55 +0200 |
|---|---|---|
| committer | Denys Vlasenko | 2019-10-24 16:26:55 +0200 |
| commit | be5a505d771a77c640acc35ceaa470c80e62f954 (patch) | |
| tree | c15e916dcf9ea7809794e36440c066f5b2f79598 /coreutils | |
| parent | 7427406580e78666fad3634b4bfaf1922d4bb457 (diff) | |
| download | busybox-be5a505d771a77c640acc35ceaa470c80e62f954.zip busybox-be5a505d771a77c640acc35ceaa470c80e62f954.tar.gz | |
Remove syscall wrappers around clock_gettime, closes 12091
12091 "Direct use of __NR_clock_gettime is not time64-safe".
function old new delta
runsv_main 1698 1712 +14
startservice 378 383 +5
get_mono 31 25 -6
date_main 932 926 -6
gettimeofday_ns 17 - -17
------------------------------------------------------------------------------
(add/remove: 0/1 grow/shrink: 2/2 up/down: 19/-29) Total: -10 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/date.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/coreutils/date.c b/coreutils/date.c index 7312415..f7e9a8d 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -33,10 +33,9 @@ //config: Enable option (-I) to output an ISO-8601 compliant //config: date/time string. //config: -//config:# defaults to "no": stat's nanosecond field is a bit non-portable //config:config FEATURE_DATE_NANO //config: bool "Support %[num]N nanosecond format specifier" -//config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) +//config: default n # stat's nanosecond field is a bit non-portable //config: depends on DATE //config: select PLATFORM_LINUX //config: help @@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, char **argv) */ #endif } else { -#if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) - /* libc has incredibly messy way of doing this, - * typically requiring -lrt. We just skip all this mess */ - syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); -#elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 - /* Let's only support the 64 suffix syscalls for 64-bit time_t. - * This simplifies the code for us as we don't need to convert - * between 64-bit and 32-bit. We also don't have a way to - * report overflow errors here. - */ - syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); +#if ENABLE_FEATURE_DATE_NANO + clock_gettime(CLOCK_REALTIME, &ts); #else time(&ts.tv_sec); #endif |