diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-01-20 10:55:18 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-01-20 10:55:18 +0000 |
commit | 70e9163c9c18e995515598085cb824e554eb7ae7 (patch) | |
tree | a42dc8b2a6c031354bf31472de888bfc8a060132 /lib/readutmp.c | |
parent | cbf5993c43f49281173f185863577d86bfac6eae (diff) | |
download | coreutils-tarball-70e9163c9c18e995515598085cb824e554eb7ae7.tar.gz |
coreutils-8.25HEADcoreutils-8.25master
Diffstat (limited to 'lib/readutmp.c')
-rw-r--r-- | lib/readutmp.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/lib/readutmp.c b/lib/readutmp.c index 73c7b53..d9b1efa 100644 --- a/lib/readutmp.c +++ b/lib/readutmp.c @@ -1,12 +1,11 @@ /* GNU's read utmp module. - Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software - Foundation, Inc. + Copyright (C) 1992-2001, 2003-2006, 2009-2016 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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 @@ -14,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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* Written by jla; revised by djm */ @@ -32,6 +30,7 @@ #include <stdbool.h> #include <string.h> #include <stdlib.h> +#include <stdint.h> #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. */ @@ -66,7 +61,7 @@ extract_trimmed_name (const STRUCT_UTMP *ut) /* Is the utmp entry U desired by the user who asked for OPTIONS? */ -static inline bool +static bool desirable_utmp_entry (STRUCT_UTMP const *u, int options) { bool user_proc = IS_USER_PROCESS (u); @@ -74,8 +69,8 @@ desirable_utmp_entry (STRUCT_UTMP const *u, int options) return false; if ((options & READ_UTMP_CHECK_PIDS) && user_proc - && (UT_PID (u) <= 0 - || (kill (UT_PID (u), 0) < 0 && errno == ESRCH))) + && 0 < UT_PID (u) + && (kill (UT_PID (u), 0) < 0 && errno == ESRCH)) return false; return true; } @@ -91,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; @@ -102,17 +97,17 @@ read_utmp (char const *file, 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 (file); + UTMP_NAME_FUNCTION ((char *) 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 (); @@ -127,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; @@ -141,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); } |