X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Freadutmp.h;h=84cf117924d45996e50f2f53ccdbe1757efe7232;hb=b7ba0cb08a894c8a738c8cb3b4039bc32c2c4661;hp=d122987e53553218ba6c36e042b6c4f1d95dfdca;hpb=68af56be3e061b97cf97150094bc50b0aa364cbb;p=gnulib.git diff --git a/lib/readutmp.h b/lib/readutmp.h index d122987e5..84cf11792 100644 --- a/lib/readutmp.h +++ b/lib/readutmp.h @@ -1,7 +1,6 @@ /* Declarations for GNU's read utmp module. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003 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 @@ -15,7 +14,7 @@ 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 */ @@ -24,11 +23,23 @@ # include -# ifdef HAVE_UTMPX_H -# ifdef HAVE_UTMP_H +/* AIX 4.3.3 has both utmp.h and utmpx.h, but only struct utmp + has the ut_exit member. */ +# if (HAVE_UTMPX_H && HAVE_UTMP_H && HAVE_STRUCT_UTMP_UT_EXIT \ + && ! HAVE_STRUCT_UTMPX_UT_EXIT) +# undef HAVE_UTMPX_H +# endif + +# 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) @@ -38,7 +49,29 @@ # ifdef HAVE_UTMPXNAME # define UTMP_NAME_FUNCTION utmpxname # endif -# else + +# if HAVE_STRUCT_UTMPX_UT_EXIT_E_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.e_termination) +# else +# if HAVE_STRUCT_UTMPX_UT_EXIT_UT_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.ut_termination) +# else +# define UT_EXIT_E_TERMINATION(U) 0 +# endif +# endif + +# if HAVE_STRUCT_UTMPX_UT_EXIT_E_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.e_exit) +# else +# if HAVE_STRUCT_UTMPX_UT_EXIT_UT_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.ut_exit) +# else +# define UT_EXIT_E_EXIT(U) 0 +# endif +# endif + +# elif HAVE_UTMP_H + # include # if !HAVE_DECL_GETUTENT struct utmp *getutent(); @@ -51,10 +84,31 @@ # ifdef HAVE_UTMPNAME # define UTMP_NAME_FUNCTION utmpname # endif + +# if HAVE_STRUCT_UTMP_UT_EXIT_E_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.e_termination) +# else +# if HAVE_STRUCT_UTMP_UT_EXIT_UT_TERMINATION +# define UT_EXIT_E_TERMINATION(U) ((U)->ut_exit.ut_termination) +# else +# define UT_EXIT_E_TERMINATION(U) 0 +# endif +# endif + +# if HAVE_STRUCT_UTMP_UT_EXIT_E_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.e_exit) +# else +# if HAVE_STRUCT_UTMP_UT_EXIT_UT_EXIT +# define UT_EXIT_E_EXIT(U) ((U)->ut_exit.ut_exit) +# else +# define UT_EXIT_E_EXIT(U) 0 +# endif +# endif + # 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) @@ -64,14 +118,14 @@ # 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 +# define UT_USER(Utmp) ((Utmp)->ut_user) # endif # if HAVE_STRUCT_UTMP_UT_NAME # undef UT_USER -# define UT_USER(Utmp) Utmp->ut_name +# define UT_USER(Utmp) ((Utmp)->ut_name) # endif # endif @@ -88,27 +142,15 @@ (HAVE_STRUCT_UTMP_UT_PID \ || HAVE_STRUCT_UTMPX_UT_PID) -# define HAVE_STRUCT_XTMP_UT_TYPE \ - (HAVE_STRUCT_UTMP_UT_TYPE \ - || HAVE_STRUCT_UTMPX_UT_TYPE) - typedef struct UTMP_STRUCT_NAME STRUCT_UTMP; -# include -# ifdef HAVE_SYS_PARAM_H -# include -# endif +enum { UT_USER_SIZE = sizeof UT_USER ((STRUCT_UTMP *) 0) }; -# include -# ifndef errno -extern int errno; -# endif - -# 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 @@ -130,7 +172,46 @@ extern int errno; # define WTMP_FILE "/etc/wtmp" # endif +# if HAVE_STRUCT_XTMP_UT_PID +# define UT_PID(U) ((U)->ut_pid) +# else +# define UT_PID(U) 0 +# endif + +# if HAVE_STRUCT_UTMP_UT_TYPE || HAVE_STRUCT_UTMPX_UT_TYPE +# define UT_TYPE_EQ(U, V) ((U)->ut_type == (V)) +# define UT_TYPE_NOT_DEFINED 0 +# else +# define UT_TYPE_EQ(U, V) 0 +# define UT_TYPE_NOT_DEFINED 1 +# endif + +# ifdef BOOT_TIME +# define UT_TYPE_BOOT_TIME(U) UT_TYPE_EQ (U, BOOT_TIME) +# else +# define UT_TYPE_BOOT_TIME(U) 0 +# endif + +# ifdef USER_PROCESS +# define UT_TYPE_USER_PROCESS(U) UT_TYPE_EQ (U, USER_PROCESS) +# else +# define UT_TYPE_USER_PROCESS(U) 0 +# endif + +# define IS_USER_PROCESS(U) \ + (UT_USER (U)[0] \ + && (UT_TYPE_USER_PROCESS (U) \ + || (UT_TYPE_NOT_DEFINED && UT_TIME_MEMBER (U) != 0))) + +/* Options for read_utmp. */ +enum + { + READ_UTMP_CHECK_PIDS = 1, + READ_UTMP_USER_PROCESS = 2 + }; + char *extract_trimmed_name (const STRUCT_UTMP *ut); -int read_utmp (const char *filename, int *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__ */