X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.h;h=1e43a31e84dad5fad2ccd37638a9f92d810331d6;hb=4565266f776db0d78b2c207a5fe79f929f9806ca;hp=d04c94d2edd1614568b0b9b5ff0259227bd2aaab;hpb=8b03458ebe93a6e1c86c3a468aa3f2eee01e3c4c;p=gnulib.git
diff --git a/lib/readutmp.h b/lib/readutmp.h
index d04c94d2e..1e43a31e8 100644
--- a/lib/readutmp.h
+++ b/lib/readutmp.h
@@ -1,12 +1,11 @@
/* Declarations for GNU's read utmp module.
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
- 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 1992-2007 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by jla; revised by djm */
@@ -31,11 +29,16 @@
# undef HAVE_UTMPX_H
# endif
-# ifdef HAVE_UTMPX_H
-# ifdef HAVE_UTMP_H
+# if HAVE_UTMPX_H
+# if HAVE_UTMP_H
/* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */
# include
# endif
+# if defined _THREAD_SAFE && defined UTMP_DATA_INIT
+ /* When including both utmp.h and utmpx.h on AIX 4.3, with _THREAD_SAFE
+ defined, work around the duplicate struct utmp_data declaration. */
+# define utmp_data gl_aix_4_3_workaround_utmp_data
+# endif
# include
# define UTMP_STRUCT_NAME utmpx
# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)
@@ -66,7 +69,8 @@
# endif
# endif
-# else
+# elif HAVE_UTMP_H
+
# include
# if !HAVE_DECL_GETUTENT
struct utmp *getutent();
@@ -103,7 +107,7 @@
# endif
/* Accessor macro for the member named ut_user or ut_name. */
-# ifdef HAVE_UTMPX_H
+# if HAVE_UTMPX_H
# if HAVE_STRUCT_UTMPX_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
@@ -113,7 +117,7 @@
# define UT_USER(Utmp) ((Utmp)->ut_name)
# endif
-# else
+# elif HAVE_UTMP_H
# if HAVE_STRUCT_UTMP_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
@@ -141,11 +145,11 @@ typedef struct UTMP_STRUCT_NAME STRUCT_UTMP;
enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
-# if !defined (UTMP_FILE) && defined (_PATH_UTMP)
+# if !defined UTMP_FILE && defined _PATH_UTMP
# define UTMP_FILE _PATH_UTMP
# endif
-# if !defined (WTMP_FILE) && defined (_PATH_WTMP)
+# if !defined WTMP_FILE && defined _PATH_WTMP
# define WTMP_FILE _PATH_WTMP
# endif
@@ -201,11 +205,12 @@ enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
/* Options for read_utmp. */
enum
{
- READ_UTMP_CHECK_PIDS = 1
+ READ_UTMP_CHECK_PIDS = 1,
+ READ_UTMP_USER_PROCESS = 2
};
char *extract_trimmed_name (const STRUCT_UTMP *ut);
-int read_utmp (const char *filename, size_t *n_entries, STRUCT_UTMP **utmp_buf,
+int read_utmp (char const *file, size_t *n_entries, STRUCT_UTMP **utmp_buf,
int options);
#endif /* __READUTMP_H__ */