X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.c;h=f89dd68fe626f46c103c4ae11c5e94984788fad5;hb=85ed801342b9da521cc797375eb72cc050940cf8;hp=634d9ab1ffd6d364e6e0aab2babcd5de9468b88d;hpb=222b0486b7db1b09293e05512873d633440efcb3;p=gnulib.git
diff --git a/lib/readutmp.c b/lib/readutmp.c
index 634d9ab1f..f89dd68fe 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-2012 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,14 +13,11 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by jla; revised by djm */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "readutmp.h"
@@ -32,6 +30,7 @@
#include
#include
#include
+#include
#include "xalloc.h"
@@ -39,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. */
@@ -69,10 +64,15 @@ 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
- && IS_USER_PROCESS (u)
- && (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 FILE into freshly-
@@ -86,7 +86,7 @@ desirable_utmp_entry (STRUCT_UTMP const *u, int options)
int
read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
- int options)
+ int options)
{
size_t n_read = 0;
size_t n_alloc = 0;
@@ -104,10 +104,10 @@ read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
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 ();
@@ -122,7 +122,7 @@ read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
int
read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
- int options)
+ int options)
{
size_t n_read = 0;
size_t n_alloc = 0;
@@ -136,9 +136,9 @@ read_utmp (char const *file, 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);
}