/* GNU's read utmp module.
- Copyright (C) 1992-1999 Free Software Foundation, Inc.
+ Copyright (C) 1992-2001 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
#include <stdio.h>
+#include <sys/types.h>
#include <sys/stat.h>
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
# include <string.h>
#endif /* STDC_HEADERS || HAVE_STRING_H */
#include "readutmp.h"
+#include "unlocked-io.h"
char *xmalloc ();
char *realloc ();
{
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';
the number of entries, and return zero. If there is any error,
return non-zero and don't modify the parameters. */
-#if HAVE_UTMPNAME
+#ifdef UTMP_NAME_FUNCTION
int
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
Solaris' utmpname returns 1 upon success -- which is contrary
to what the GNU libc version does. In addition, older GNU libc
versions are actually void. */
- utmpname (filename);
+ UTMP_NAME_FUNCTION (filename);
- setutent ();
+ SET_UTMP_ENT ();
n_read = 0;
- while ((u = getutent ()) != NULL)
+ while ((u = GET_UTMP_ENT ()) != NULL)
{
++n_read;
utmp = (STRUCT_UTMP *) realloc (utmp, n_read * sizeof (STRUCT_UTMP));
utmp[n_read - 1] = *u;
}
- endutent ();
+ END_UTMP_ENT ();
*n_entries = n_read;
*utmp_buf = utmp;
return 0;
}
-#endif /* HAVE_UTMPNAME */
+#endif