From 5dea871ac73ef4608022c058b50adc946917f9b9 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Sun, 28 Nov 2010 20:44:21 +0100 Subject: libc_utmp: Fix getutmp and getutmpx for x86_64 On x86_64, when WORDSIZE_COMPAT32 is enabled, the ut_tv field of 'struct utmp' and 'struct utmpx' are defined as two nested structs instead of being defined as 'struct timeval', so it is not possible to directly assign the two ut_tv values. This patch split the assignment by setting each fields (tv_sec, tv_usec) of the ut_tv filed separately It is als compatible with 'struct timeval' usage. Signed-off-by: Carmelo Amoroso --- libc/misc/utmp/utxent.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libc/misc') diff --git a/libc/misc/utmp/utxent.c b/libc/misc/utmp/utxent.c index 3c59f1c48..a0e80a662 100644 --- a/libc/misc/utmp/utxent.c +++ b/libc/misc/utmp/utxent.c @@ -71,7 +71,8 @@ void getutmp (const struct utmpx *utmpx, struct utmp *utmp) memcpy (utmp->ut_host, utmpx->ut_host, sizeof (utmp->ut_host)); #endif #if _HAVE_UT_TV - 0 - utmp->ut_tv = utmpx->ut_tv; + utmp->ut_tv.tv_sec = utmpx->ut_tv.tv_sec; + utmp->ut_tv.tv_usec = utmpx->ut_tv.tv_usec; #else utmp->ut_time = utmpx->ut_time; #endif @@ -97,7 +98,8 @@ void getutmpx (const struct utmp *utmp, struct utmpx *utmpx) memcpy (utmpx->ut_host, utmp->ut_host, sizeof (utmp->ut_host)); #endif #if _HAVE_UT_TV - 0 - utmpx->ut_tv = utmp->ut_tv; + utmpx->ut_tv.tv_sec = utmp->ut_tv.tv_sec; + utmpx->ut_tv.tv_usec = utmp->ut_tv.tv_usec; #else utmpx->ut_time = utmp->ut_time; #endif -- cgit v1.2.3