bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Bug-gnulib] readutmp merge from coreutils


From: Paul Eggert
Subject: [Bug-gnulib] readutmp merge from coreutils
Date: 15 Aug 2003 20:58:32 -0700
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3

I installed this in gnulib.  It's not quite the same as coreutils,
since the coreutils Autoconf doesn't check for struct utmp.ut_exit or
struct utmpx.ut_exit, but I'll submit a separate patch to coreutils
for that.

2003-08-15  Jim Meyering  <address@hidden>
        and Paul Eggert  <address@hidden>

        * lib/readutmp.h (HAVE_UTMPX_H): Undef if struct utmp has the ut_exit
        member but strut utmpx does not.  Needed for AIX 4.3.3.
        (UT_EXIT_E_TERMINATION, UT_EXIT_E_EXIT): Define.
        * m4readutmp.m4 (gl_READUTMP): Check for ut_exit.ut_exit,
        ut_exit.e_exit, ut_exit.ut_termination, and
        ut_exit.e_termination members.

Index: lib/readutmp.h
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/readutmp.h,v
retrieving revision 1.13
diff -p -u -r1.13 readutmp.h
--- lib/readutmp.h      18 Jun 2003 05:52:19 -0000      1.13
+++ lib/readutmp.h      16 Aug 2003 03:50:14 -0000
@@ -24,6 +24,13 @@
 
 # include <sys/types.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
+
 # ifdef HAVE_UTMPX_H
 #  ifdef HAVE_UTMP_H
     /* HPUX 10.20 needs utmp.h, for the definition of e.g., UTMP_FILE.  */
@@ -38,6 +45,27 @@
 #  ifdef HAVE_UTMPXNAME
 #   define UTMP_NAME_FUNCTION utmpxname
 #  endif
+
+#  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
+
 # else
 #  include <utmp.h>
 #  if !HAVE_DECL_GETUTENT
@@ -51,6 +79,27 @@
 #  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.  */
Index: m4/readutmp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/readutmp.m4,v
retrieving revision 1.1
diff -p -u -r1.1 readutmp.m4
--- m4/readutmp.m4      31 Dec 2002 13:42:07 -0000      1.1
+++ m4/readutmp.m4      16 Aug 2003 03:50:14 -0000
@@ -1,5 +1,5 @@
-# readutmp.m4 serial 1
-dnl Copyright (C) 2002 Free Software Foundation, Inc.
+# readutmp.m4 serial 2
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
 dnl Public License, this file may be distributed as part of a program
@@ -39,6 +39,16 @@ $ac_includes_default
     AC_CHECK_MEMBERS([struct utmp.ut_id],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmpx.ut_exit],,,[$utmp_includes])
     AC_CHECK_MEMBERS([struct utmp.ut_exit],,,[$utmp_includes])
+
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_exit],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_exit],,,[$utmp_includes])
+
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.ut_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.ut_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmpx.ut_exit.e_termination],,,[$utmp_includes])
+    AC_CHECK_MEMBERS([struct utmp.ut_exit.e_termination],,,[$utmp_includes])
 
     AC_LIBOBJ(readutmp)
     gl_PREREQ_READUTMP




reply via email to

[Prev in Thread] Current Thread [Next in Thread]