d3539be8f
Alistair Francis
2019-11-19
Subject
Remove stime() function calls
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
coreutils/date.c+5 -1
| @@ -276,6 +276,9 @@ int date_main(int argc UNUSED_PARAM, char **argv) | |
| time(&ts.tv_sec); | |
| #endif | |
| } | |
| + | #if !ENABLE_FEATURE_DATE_NANO |
| + | ts.tv_nsec = 0; |
| + | #endif |
| localtime_r(&ts.tv_sec, &tm_time); | |
| /* If date string is given, update tm_time, and maybe set date */ | |
| @@ -298,9 +301,10 @@ int date_main(int argc UNUSED_PARAM, char **argv) | |
| if (date_str[0] != '@') | |
| tm_time.tm_isdst = -1; | |
| ts.tv_sec = validate_tm_time(date_str, &tm_time); | |
| + | ts.tv_nsec = 0; |
| /* if setting time, set it */ | |
| - | if ((opt & OPT_SET) && stime(&ts.tv_sec) < 0) { |
| + | if ((opt & OPT_SET) && clock_settime(CLOCK_REALTIME, &ts) < 0) { |
| bb_simple_perror_msg("can't set date"); | |
| } | |
| } | |
libbb/missing_syscalls.c+0 -8
| @@ -15,14 +15,6 @@ pid_t getsid(pid_t pid) | |
| return syscall(__NR_getsid, pid); | |
| } | |
| - | int stime(const time_t *t) |
| - | { |
| - | struct timeval tv; |
| - | tv.tv_sec = *t; |
| - | tv.tv_usec = 0; |
| - | return settimeofday(&tv, NULL); |
| - | } |
| - | |
| int sethostname(const char *name, size_t len) | |
| { | |
| return syscall(__NR_sethostname, name, len); | |
util-linux/rdate.c+6 -2
| @@ -95,9 +95,13 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) | |
| if (!(flags & 2)) { /* no -p (-s may be present) */ | |
| if (time(NULL) == remote_time) | |
| bb_simple_error_msg("current time matches remote time"); | |
| - | else |
| - | if (stime(&remote_time) < 0) |
| + | else { |
| + | struct timespec ts; |
| + | ts.tv_sec = remote_time; |
| + | ts.tv_nsec = 0; |
| + | if (clock_settime(CLOCK_REALTIME, &ts) < 0) |
| bb_simple_perror_msg_and_die("can't set time of day"); | |
| + | } |
| } | |
| if (flags != 1) /* not lone -s */ | |