X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Freadutmp.c;h=40c5a9ae299627b5dcf53825a8c8e2fcdff79117;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=c3ce7f9878c924b0bbf50cfc501a74783242f5eb;hpb=8b03458ebe93a6e1c86c3a468aa3f2eee01e3c4c;p=gnulib.git
diff --git a/lib/readutmp.c b/lib/readutmp.c
index c3ce7f987..40c5a9ae2 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -1,10 +1,11 @@
/* GNU's read utmp module.
- Copyright (C) 1992-2001, 2003, 2004, 2005 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1992-2001, 2003-2006, 2009-2010 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,8 +13,7 @@
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 */
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include "xalloc.h"
@@ -37,10 +38,6 @@
# include "unlocked-io.h"
#endif
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#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. */
@@ -67,12 +64,18 @@ extract_trimmed_name (const STRUCT_UTMP *ut)
static inline bool
desirable_utmp_entry (STRUCT_UTMP const *u, int options)
{
- return ! (options & READ_UTMP_CHECK_PIDS
- && (UT_PID (u) <= 0
- || (kill (UT_PID (u), 0) < 0 && errno == ESRCH)));
+ 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
+ && (UT_PID (u) <= 0
+ || (kill (UT_PID (u), 0) < 0 && errno == ESRCH)))
+ return false;
+ return true;
}
-/* Read the utmp entries corresponding to file FILENAME into freshly-
+/* 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.
@@ -82,8 +85,8 @@ desirable_utmp_entry (STRUCT_UTMP const *u, int options)
#ifdef UTMP_NAME_FUNCTION
int
-read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf,
- int options)
+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;
@@ -94,17 +97,17 @@ read_utmp (const char *filename, size_t *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. */
- UTMP_NAME_FUNCTION (filename);
+ UTMP_NAME_FUNCTION (file);
SET_UTMP_ENT ();
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 == n_alloc)
+ utmp = x2nrealloc (utmp, &n_alloc, sizeof *utmp);
- utmp[n_read++] = *u;
+ utmp[n_read++] = *u;
}
END_UTMP_ENT ();
@@ -118,14 +121,14 @@ read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf,
#else
int
-read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf,
- int options)
+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;
int saved_errno;
- FILE *f = fopen (filename, "r");
+ FILE *f = fopen (file, "r");
if (! f)
return -1;
@@ -133,9 +136,9 @@ read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf,
for (;;)
{
if (n_read == n_alloc)
- utmp = x2nrealloc (utmp, &n_alloc, sizeof *utmp);
+ utmp = x2nrealloc (utmp, &n_alloc, sizeof *utmp);
if (fread (&utmp[n_read], sizeof utmp[n_read], 1, f) == 0)
- break;
+ break;
n_read += desirable_utmp_entry (&utmp[n_read], options);
}