diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2019-10-24 16:26:55 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2019-10-24 16:26:55 +0200 |
commit | be5a505d771a77c640acc35ceaa470c80e62f954 (patch) | |
tree | c15e916dcf9ea7809794e36440c066f5b2f79598 /coreutils/date.c | |
parent | 7427406580e78666fad3634b4bfaf1922d4bb457 (diff) | |
download | busybox-w32-be5a505d771a77c640acc35ceaa470c80e62f954.tar.gz busybox-w32-be5a505d771a77c640acc35ceaa470c80e62f954.tar.bz2 busybox-w32-be5a505d771a77c640acc35ceaa470c80e62f954.zip |
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/date.c')
-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 731241536..f7e9a8d0e 100644 --- a/coreutils/date.c +++ b/coreutils/date.c | |||
@@ -33,10 +33,9 @@ | |||
33 | //config: Enable option (-I) to output an ISO-8601 compliant | 33 | //config: Enable option (-I) to output an ISO-8601 compliant |
34 | //config: date/time string. | 34 | //config: date/time string. |
35 | //config: | 35 | //config: |
36 | //config:# defaults to "no": stat's nanosecond field is a bit non-portable | ||
37 | //config:config FEATURE_DATE_NANO | 36 | //config:config FEATURE_DATE_NANO |
38 | //config: bool "Support %[num]N nanosecond format specifier" | 37 | //config: bool "Support %[num]N nanosecond format specifier" |
39 | //config: default n # syscall(__NR_clock_gettime) or syscall(__NR_clock_gettime64) | 38 | //config: default n # stat's nanosecond field is a bit non-portable |
40 | //config: depends on DATE | 39 | //config: depends on DATE |
41 | //config: select PLATFORM_LINUX | 40 | //config: select PLATFORM_LINUX |
42 | //config: help | 41 | //config: help |
@@ -271,17 +270,8 @@ int date_main(int argc UNUSED_PARAM, char **argv) | |||
271 | */ | 270 | */ |
272 | #endif | 271 | #endif |
273 | } else { | 272 | } else { |
274 | #if ENABLE_FEATURE_DATE_NANO && defined(__NR_clock_gettime) | 273 | #if ENABLE_FEATURE_DATE_NANO |
275 | /* libc has incredibly messy way of doing this, | 274 | clock_gettime(CLOCK_REALTIME, &ts); |
276 | * typically requiring -lrt. We just skip all this mess */ | ||
277 | syscall(__NR_clock_gettime, CLOCK_REALTIME, &ts); | ||
278 | #elif ENABLE_FEATURE_DATE_NANO && __TIMESIZE == 64 | ||
279 | /* Let's only support the 64 suffix syscalls for 64-bit time_t. | ||
280 | * This simplifies the code for us as we don't need to convert | ||
281 | * between 64-bit and 32-bit. We also don't have a way to | ||
282 | * report overflow errors here. | ||
283 | */ | ||
284 | syscall(__NR_clock_gettime64, CLOCK_REALTIME, &ts); | ||
285 | #else | 275 | #else |
286 | time(&ts.tv_sec); | 276 | time(&ts.tv_sec); |
287 | #endif | 277 | #endif |