X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.c;h=ec6e2759d197333ef6dad9e5d4573b582a9f3496;hb=5191b3546cfb6c163228c23f214e325ddf60d46f;hp=d29163c0c1b5b44202127793479b9038afed2202;hpb=7abd4b240bc7c882a73035f494321855f8876d39;p=gnulib.git
diff --git a/lib/readutmp.c b/lib/readutmp.c
index d29163c0c..ec6e2759d 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -1,10 +1,11 @@
/* GNU's read utmp module.
- Copyright (C) 92, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1992-2001, 2003-2006, 2009-2013 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
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,23 +13,30 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by jla; revised by djm */
#include
+#include "readutmp.h"
+
+#include
+#include
+
+#include
#include
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include
-#else
-# include
-#endif /* STDC_HEADERS || HAVE_STRING_H */
+#include
+#include
+#include
+#include
+#include
-#include "readutmp.h"
+#include "xalloc.h"
-char *xmalloc ();
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
/* Copy UT->ut_name into storage obtained from malloc. Then remove any
trailing spaces from the copy, NUL terminate it, and return the copy. */
@@ -38,81 +46,74 @@ 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));
- /* 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)] = ' ';
- p = strchr (trimmed_name, ' ');
- if (p != NULL)
- *p = '\0';
+ trimmed_name = xmalloc (sizeof (UT_USER (ut)) + 1);
+ strncpy (trimmed_name, UT_USER (ut), sizeof (UT_USER (ut)));
+ /* Append a trailing NUL. Some systems pad names shorter than the
+ maximum with spaces, others pad with NULs. Remove any trailing
+ spaces. */
+ trimmed_name[sizeof (UT_USER (ut))] = '\0';
+ for (p = trimmed_name + strlen (trimmed_name);
+ trimmed_name < p && p[-1] == ' ';
+ *--p = '\0')
+ continue;
return trimmed_name;
}
-/* Read the utmp file FILENAME into *UTMP_BUF, set *N_ENTRIES to the
- number of entries read, and return zero. If there is any error,
- return non-zero and don't modify the parameters. */
+/* Is the utmp entry U desired by the user who asked for OPTIONS? */
-#ifdef HAVE_UTMPNAME
-
-int
-read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
+static bool
+desirable_utmp_entry (STRUCT_UTMP const *u, int options)
{
- int count_utmp = 0;
- int n_read;
- STRUCT_UTMP *u;
- STRUCT_UTMP *uptr;
- STRUCT_UTMP *utmp_contents;
-
- if (utmpname (filename))
- {
- return 1;
- }
-
- /* FIXME: going through the list twice is wasteful. */
+ bool user_proc = IS_USER_PROCESS (u);
+ if ((options & READ_UTMP_USER_PROCESS) && !user_proc)
+ return false;
+ if ((options & READ_UTMP_CHECK_PIDS)
+ && user_proc
+ && 0 < UT_PID (u)
+ && (kill (UT_PID (u), 0) < 0 && errno == ESRCH))
+ return false;
+ return true;
+}
- /* count the entries in utmp */
- setutent ();
- while ((u = getutent ()) != NULL)
- ++count_utmp;
+/* Read the utmp entries corresponding to file FILE into freshly-
+ malloc'd storage, set *UTMP_BUF to that pointer, set *N_ENTRIES to
+ the number of entries, and return zero. If there is any error,
+ return -1, setting errno, and don't modify the parameters.
+ If OPTIONS & READ_UTMP_CHECK_PIDS is nonzero, omit entries whose
+ process-IDs do not currently exist. */
- if (count_utmp == 0)
- return 0;
+#ifdef UTMP_NAME_FUNCTION
- utmp_contents = (STRUCT_UTMP *) xmalloc (count_utmp * sizeof (STRUCT_UTMP));
+int
+read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
+ int options)
+{
+ size_t n_read = 0;
+ size_t n_alloc = 0;
+ STRUCT_UTMP *utmp = NULL;
+ STRUCT_UTMP *u;
- /* read the entries in utmp */
+ /* 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 (file);
- /* FIXME: can this fail? */
- setutent ();
+ SET_UTMP_ENT ();
- n_read = 0;
- uptr = utmp_contents;
- while ((u = getutent ()) != NULL)
- {
- ++n_read;
- if (n_read > count_utmp)
- {
- STRUCT_UTMP *old_utmp_contents = utmp_contents;
- ++count_utmp;
- utmp_contents = (STRUCT_UTMP *) xrealloc (utmp_contents,
- (count_utmp
- * sizeof (STRUCT_UTMP)));
- uptr = utmp_contents + (uptr - old_utmp_contents);
- }
- *uptr = *u;
- ++uptr;
- }
+ while ((u = GET_UTMP_ENT ()) != NULL)
+ if (desirable_utmp_entry (u, options))
+ {
+ if (n_read == n_alloc)
+ utmp = x2nrealloc (utmp, &n_alloc, sizeof *utmp);
- if (n_read != count_utmp)
- utmp_contents = (STRUCT_UTMP *) xrealloc (utmp_contents,
- n_read * sizeof (STRUCT_UTMP));
+ utmp[n_read++] = *u;
+ }
- /* FIXME: can this fail? */
- endutent ();
+ END_UTMP_ENT ();
*n_entries = n_read;
- *utmp_buf = utmp_contents;
+ *utmp_buf = utmp;
return 0;
}
@@ -120,38 +121,41 @@ read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
#else
int
-read_utmp (const char *filename, int *n_entries, STRUCT_UTMP **utmp_buf)
+read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
+ int options)
{
- FILE *utmp;
- struct stat file_stats;
- size_t n_read;
- size_t size;
- STRUCT_UTMP *buf;
-
- utmp = fopen (filename, "r");
- if (utmp == NULL)
- return 1;
-
- fstat (fileno (utmp), &file_stats);
- size = file_stats.st_size;
- if (size > 0)
- buf = (STRUCT_UTMP *) xmalloc (size);
- else
+ size_t n_read = 0;
+ size_t n_alloc = 0;
+ STRUCT_UTMP *utmp = NULL;
+ int saved_errno;
+ FILE *f = fopen (file, "r");
+
+ if (! f)
+ return -1;
+
+ for (;;)
{
- fclose (utmp);
- return 1;
+ if (n_read == n_alloc)
+ utmp = x2nrealloc (utmp, &n_alloc, sizeof *utmp);
+ if (fread (&utmp[n_read], sizeof utmp[n_read], 1, f) == 0)
+ break;
+ n_read += desirable_utmp_entry (&utmp[n_read], options);
}
- /* Use < instead of != in case the utmp just grew. */
- n_read = fread (buf, 1, size, utmp);
- if (ferror (utmp) || fclose (utmp) == EOF
- || n_read < size)
- return 1;
+ saved_errno = ferror (f) ? errno : 0;
+ if (fclose (f) != 0)
+ saved_errno = errno;
+ if (saved_errno != 0)
+ {
+ free (utmp);
+ errno = saved_errno;
+ return -1;
+ }
- *n_entries = size / sizeof (STRUCT_UTMP);
- *utmp_buf = buf;
+ *n_entries = n_read;
+ *utmp_buf = utmp;
return 0;
}
-#endif /* HAVE_UTMPNAME */
+#endif