diff options
author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /util-linux/rdate.c | |
parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'util-linux/rdate.c')
-rw-r--r-- | util-linux/rdate.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/util-linux/rdate.c b/util-linux/rdate.c index bb1dc519a..9b80141c9 100644 --- a/util-linux/rdate.c +++ b/util-linux/rdate.c | |||
@@ -96,11 +96,10 @@ int rdate_main(int argc UNUSED_PARAM, char **argv) | |||
96 | if (time(NULL) == remote_time) | 96 | if (time(NULL) == remote_time) |
97 | bb_simple_error_msg("current time matches remote time"); | 97 | bb_simple_error_msg("current time matches remote time"); |
98 | else { | 98 | else { |
99 | struct timespec ts; | 99 | struct timeval ts; |
100 | ts.tv_sec = remote_time; | 100 | ts.tv_sec = remote_time; |
101 | ts.tv_nsec = 0; | 101 | ts.tv_usec = 0; |
102 | if (clock_settime(CLOCK_REALTIME, &ts) < 0) | 102 | xsettimeofday(&ts); |
103 | bb_simple_perror_msg_and_die("can't set time of day"); | ||
104 | } | 103 | } |
105 | } | 104 | } |
106 | 105 | ||