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 /miscutils/ts.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 'miscutils/ts.c')
-rw-r--r-- | miscutils/ts.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miscutils/ts.c b/miscutils/ts.c index f769d663b..3eecb7464 100644 --- a/miscutils/ts.c +++ b/miscutils/ts.c | |||
@@ -50,13 +50,13 @@ int ts_main(int argc UNUSED_PARAM, char **argv) | |||
50 | 50 | ||
51 | #define date_buf bb_common_bufsiz1 | 51 | #define date_buf bb_common_bufsiz1 |
52 | setup_common_bufsiz(); | 52 | setup_common_bufsiz(); |
53 | gettimeofday(&base, NULL); | 53 | xgettimeofday(&base); |
54 | 54 | ||
55 | while ((line = xmalloc_fgets(stdin)) != NULL) { | 55 | while ((line = xmalloc_fgets(stdin)) != NULL) { |
56 | struct timeval ts; | 56 | struct timeval ts; |
57 | struct tm tm_time; | 57 | struct tm tm_time; |
58 | 58 | ||
59 | gettimeofday(&ts, NULL); | 59 | xgettimeofday(&ts); |
60 | if (opt) { | 60 | if (opt) { |
61 | /* -i and/or -s */ | 61 | /* -i and/or -s */ |
62 | struct timeval ts1 = ts1; | 62 | struct timeval ts1 = ts1; |