From 226d63000a25c5f20ceecd610457b32d867909c7 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 30 Jan 2000 16:41:25 +0000 Subject: [PATCH] (extract_trimmed_name): Use UT_USER instead of hard-coding uses of ->ut_name. The latter doesn't work with new Linux header files where only utmpx.ut_user is declared. --- lib/readutmp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/readutmp.c b/lib/readutmp.c index f395352994..1c680f0271 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -1,5 +1,5 @@ /* GNU's read utmp module. - Copyright (C) 1992-1999 Free Software Foundation, Inc. + Copyright (C) 1992-2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,11 +41,11 @@ extract_trimmed_name (const STRUCT_UTMP *ut) { char *p, *trimmed_name; - trimmed_name = xmalloc (sizeof (ut->ut_name) + 1); - strncpy (trimmed_name, ut->ut_name, sizeof (ut->ut_name)); + trimmed_name = xmalloc (sizeof (UT_USER (ut)) + 1); + strncpy (trimmed_name, UT_USER (ut), sizeof (UT_USER (ut))); /* Append a trailing space character. Some systems pad names shorter than the maximum with spaces, others pad with NULs. Remove any spaces. */ - trimmed_name[sizeof (ut->ut_name)] = ' '; + trimmed_name[sizeof (UT_USER (ut))] = ' '; p = strchr (trimmed_name, ' '); if (p != NULL) *p = '\0'; -- 2.30.2