X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.c;h=634d9ab1ffd6d364e6e0aab2babcd5de9468b88d;hb=707a7ac4b2eb3209fd1b67b1650a8fef5cf7c5e4;hp=c3ce7f9878c924b0bbf50cfc501a74783242f5eb;hpb=8b03458ebe93a6e1c86c3a468aa3f2eee01e3c4c;p=gnulib.git

diff --git a/lib/readutmp.c b/lib/readutmp.c
index c3ce7f987..634d9ab1f 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -13,11 +13,13 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by jla; revised by djm */
 
-#include <config.h>
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
 
 #include "readutmp.h"
 
@@ -68,11 +70,12 @@ 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)));
 }
 
-/* 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,7 +85,7 @@ 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,
+read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
 	   int options)
 {
   size_t n_read = 0;
@@ -94,7 +97,7 @@ 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 ();
 
@@ -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,
+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;