projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix logic bug introduced on 2007-05-06.
[gnulib.git]
/
lib
/
readutmp.h
diff --git
a/lib/readutmp.h
b/lib/readutmp.h
index
f5797eb
..
84cf117
100644
(file)
--- a/
lib/readutmp.h
+++ b/
lib/readutmp.h
@@
-1,7
+1,6
@@
/* Declarations for GNU's read utmp module.
/* 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
it under the terms of the GNU General Public License as published by
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,11
+30,16
@@
# undef HAVE_UTMPX_H
# endif
# undef HAVE_UTMPX_H
# endif
-# if
def
HAVE_UTMPX_H
-# if
def
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 <utmp.h>
# endif
/* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE. */
# include <utmp.h>
# 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 <utmpx.h>
# define UTMP_STRUCT_NAME utmpx
# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)
# include <utmpx.h>
# define UTMP_STRUCT_NAME utmpx
# define UT_TIME_MEMBER(UT_PTR) ((UT_PTR)->ut_tv.tv_sec)
@@
-66,7
+70,8
@@
# endif
# endif
# endif
# endif
-# else
+# elif HAVE_UTMP_H
+
# include <utmp.h>
# if !HAVE_DECL_GETUTENT
struct utmp *getutent();
# include <utmp.h>
# if !HAVE_DECL_GETUTENT
struct utmp *getutent();
@@
-103,7
+108,7
@@
# endif
/* Accessor macro for the member named ut_user or ut_name. */
# endif
/* Accessor macro for the member named ut_user or ut_name. */
-# if
def
HAVE_UTMPX_H
+# if HAVE_UTMPX_H
# if HAVE_STRUCT_UTMPX_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
# if HAVE_STRUCT_UTMPX_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
@@
-113,7
+118,7
@@
# define UT_USER(Utmp) ((Utmp)->ut_name)
# endif
# define UT_USER(Utmp) ((Utmp)->ut_name)
# endif
-# el
se
+# el
if HAVE_UTMP_H
# if HAVE_STRUCT_UTMP_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
# if HAVE_STRUCT_UTMP_UT_USER
# define UT_USER(Utmp) ((Utmp)->ut_user)
@@
-141,11
+146,11
@@
typedef struct UTMP_STRUCT_NAME STRUCT_UTMP;
enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
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
# 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
# define WTMP_FILE _PATH_WTMP
# endif
@@
-201,7
+206,8
@@
enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) };
/* Options for read_utmp. */
enum
{
/* 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);
};
char *extract_trimmed_name (const STRUCT_UTMP *ut);