projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
.
[gnulib.git]
/
lib
/
readutmp.c
diff --git
a/lib/readutmp.c
b/lib/readutmp.c
index
f2fd7f9
..
29b24a5
100644
(file)
--- a/
lib/readutmp.c
+++ b/
lib/readutmp.c
@@
-1,5
+1,5
@@
/* GNU's read utmp module.
/* 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
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
@@
-21,6
+21,7
@@
#include <stdio.h>
#include <stdio.h>
+#include <sys/types.h>
#include <sys/stat.h>
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
# include <string.h>
#include <sys/stat.h>
#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
# include <string.h>
@@
-41,11
+42,11
@@
extract_trimmed_name (const STRUCT_UTMP *ut)
{
char *p, *trimmed_name;
{
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. */
/* 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';
p = strchr (trimmed_name, ' ');
if (p != NULL)
*p = '\0';
@@
-57,7
+58,7
@@
extract_trimmed_name (const STRUCT_UTMP *ut)
the number of entries, and return zero. If there is any error,
return non-zero and don't modify the parameters. */
the number of entries, and return zero. If there is any error,
return non-zero and don't modify the parameters. */
-#if
HAVE_UTMPNAME
+#if
def UTMP_NAME_FUNCTION
int
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
int
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
@@
-66,13
+67,16
@@
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
STRUCT_UTMP *u;
STRUCT_UTMP *utmp = NULL;
STRUCT_UTMP *u;
STRUCT_UTMP *utmp = NULL;
- if (utmpname (filename))
- return 1;
+ /* Ignore the return value for now.
+ 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. */
+ UTMP_NAME_FUNCTION (filename);
-
setutent
();
+
SET_UTMP_ENT
();
n_read = 0;
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));
{
++n_read;
utmp = (STRUCT_UTMP *) realloc (utmp, n_read * sizeof (STRUCT_UTMP));
@@
-81,7
+85,7
@@
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
utmp[n_read - 1] = *u;
}
utmp[n_read - 1] = *u;
}
-
endutent
();
+
END_UTMP_ENT
();
*n_entries = n_read;
*utmp_buf = utmp;
*n_entries = n_read;
*utmp_buf = utmp;
@@
-126,4
+130,4
@@
read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
return 0;
}
return 0;
}
-#endif
/* HAVE_UTMPNAME */
+#endif