summaryrefslogtreecommitdiff
path: root/miscutils/last_fancy.c
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-11 12:19:14 +0000
committerDenis Vlasenko2008-07-11 12:19:14 +0000
commitdee8587d9208e4ea5ba8f8bb73b555007529372e (patch)
tree303d21aeec9e3922e296ecc9041598a87a79b554 /miscutils/last_fancy.c
parentf941306199d7cb00be68483169f202432a9a9a7d (diff)
downloadbusybox-dee8587d9208e4ea5ba8f8bb73b555007529372e.zip
busybox-dee8587d9208e4ea5ba8f8bb73b555007529372e.tar.gz
Apply post-1.11.0 patches. Bump version to 1.11.1.
Diffstat (limited to 'miscutils/last_fancy.c')
-rw-r--r--miscutils/last_fancy.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
index 2b7fee6..d4d35b1 100644
--- a/miscutils/last_fancy.c
+++ b/miscutils/last_fancy.c
@@ -48,8 +48,12 @@ static void show_entry(struct utmp *ut, int state, time_t dur_secs)
char logout_time[8];
const char *logout_str;
const char *duration_str;
+ time_t tmp;
- safe_strncpy(login_time, ctime(&(ut->ut_tv.tv_sec)), 17);
+ /* manpages say ut_tv.tv_sec *is* time_t,
+ * but some systems have it wrong */
+ tmp = ut->ut_tv.tv_sec;
+ safe_strncpy(login_time, ctime(&tmp), 17);
snprintf(logout_time, 8, "- %s", ctime(&dur_secs) + 11);
dur_secs = MAX(dur_secs - (time_t)ut->ut_tv.tv_sec, (time_t)0);