diff options
author | Jim Meyering <jim@meyering.net> | 2000-01-30 16:41:25 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 2000-01-30 16:41:25 +0000 |
commit | 22cb099f3cc1f9fe081c41c1fe99d6f2b6a0f3e0 (patch) | |
tree | fcdaf9b7b3710579937229692d7dae315f7291cc /lib/readutmp.c | |
parent | b737ed325a4d8cd6ad2ed253c646e24efe170b7f (diff) | |
download | coreutils-22cb099f3cc1f9fe081c41c1fe99d6f2b6a0f3e0.tar.xz |
(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.
Diffstat (limited to 'lib/readutmp.c')
-rw-r--r-- | lib/readutmp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/readutmp.c b/lib/readutmp.c index f39535299..1c680f027 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'; |