svn commit: trunk/busybox/miscutils

[vda at busybox.net]

Author: vda
Date: 2008-07-09 12:48:43 -0700 (Wed, 09 Jul 2008)
New Revision: 22719

Log:
last: fix ctime(ptr) ptr type mismatch



Modified:
   trunk/busybox/miscutils/last_fancy.c


Changeset:
Modified: trunk/busybox/miscutils/last_fancy.c
===================================================================
--- trunk/busybox/miscutils/last_fancy.c	2008-07-09 19:44:08 UTC (rev 22718)
+++ trunk/busybox/miscutils/last_fancy.c	2008-07-09 19:48:43 UTC (rev 22719)
@@ -48,8 +48,12 @@
 	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);