X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.c;h=38453eb447e105a3583f237154aab0c8fdae49d3;hb=69c1421980ea9c5e26f51079b467be67886bcead;hp=88aed38d417ec62af84ffae48770180044b508b5;hpb=57fdfd3f8ec62b105c53bcdf6f127c35c7fe7391;p=gnulib.git

diff --git a/lib/readutmp.c b/lib/readutmp.c
index 88aed38d4..38453eb44 100644
--- a/lib/readutmp.c
+++ b/lib/readutmp.c
@@ -1,7 +1,6 @@
 /* GNU's read utmp module.
 
-   Copyright (C) 1992-2001, 2003, 2004, 2005, 2006 Free Software
-   Foundation, Inc.
+   Copyright (C) 1992-2001, 2003-2006, 2009-2011 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
@@ -31,6 +30,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 
 #include "xalloc.h"
 
@@ -38,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.  */
 
@@ -74,7 +70,7 @@ desirable_utmp_entry (STRUCT_UTMP const *u, int options)
   if ((options & READ_UTMP_CHECK_PIDS)
       && user_proc
       && (UT_PID (u) <= 0
-	  || (kill (UT_PID (u), 0) < 0 && errno == ESRCH)))
+          || (kill (UT_PID (u), 0) < 0 && errno == ESRCH)))
     return false;
   return true;
 }
@@ -90,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;
@@ -108,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 ();
@@ -126,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;
@@ -140,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);
     }