Mercurial > hg > octave-nkf > gnulib-hg
changeset 2227:509768b4e550
(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.
| author | Jim Meyering <jim@meyering.net> |
|---|---|
| date | Sun, 30 Jan 2000 16:41:25 +0000 |
| parents | 1b6275c2d099 |
| children | cde4d94f6ccf |
| files | lib/readutmp.c |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ { 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';