Update

1999-05-13  H.J. Lu  <hjl@gnu.org>

	* login/Versions (getutmpx): Added to GLIBC_2.1.1.
	(getutmp): Likewise.

	* sysdeps/gnu/Makefile (sysdep_routines): Add getutmp and
	getutmpx for login.

	* sysdeps/gnu/utmpx.h (getutmp): Added.
	(getutmpx): Likewise.

	* sysdeps/generic/getutmp.c: New file.

	* sysdeps/generic/getutmpx.c: New file.

6 files changed, 108 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c393bb74ad..d91bb81e15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+1999-05-13  H.J. Lu  <hjl@gnu.org>
+
+	* login/Versions (getutmpx): Added to GLIBC_2.1.1.
+	(getutmp): Likewise.
+
+	* sysdeps/gnu/Makefile (sysdep_routines): Add getutmp and
+	getutmpx for login.
+
+	* sysdeps/gnu/utmpx.h (getutmp): Added.
+	(getutmpx): Likewise.
+
+	* sysdeps/generic/getutmp.c: New file.
+
+	* sysdeps/generic/getutmpx.c: New file.
+
 1999-05-13  Andreas Jaeger  <aj@arthur.rhein-neckar.de>
 
 	* glibcbug.in (BUGGLIBC): Change address to
diff --git a/login/Versions b/login/Versions
index b7cc90c7da..11a069a47f 100644
--- a/login/Versions
+++ b/login/Versions
@@ -32,6 +32,10 @@ libc {
     # u*
     unlockpt; updwtmpx; utmpxname;
   }
+  GLIBC_2.1.1 {
+    # g*
+    getutmpx; getutmp;
+  }
 }
 
 libutil {
diff --git a/sysdeps/generic/getutmp.c b/sysdeps/generic/getutmp.c
new file mode 100644
index 0000000000..317a886752
--- /dev/null
+++ b/sysdeps/generic/getutmp.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <utmp.h>
+#include <utmpx.h>
+
+void
+getutmp (const struct utmpx *utmpx, struct utmp *utmp)
+{
+  utmp->ut_type = utmpx->ut_type;
+  utmp->ut_pid = utmpx->ut_pid;
+  memcpy (utmp->ut_line, utmpx->ut_line, sizeof (utmp->ut_line));
+  memcpy (utmp->ut_id, utmpx->ut_id, sizeof (utmp->ut_id));
+  memcpy (utmp->ut_user, utmpx->ut_user, sizeof (utmp->ut_user));
+  memcpy (utmp->ut_host, utmpx->ut_host, sizeof (utmp->ut_host));
+#ifdef _GNU_SOURCE
+  utmp->ut_exit.e_termination = utmpx->ut_exit.e_termination;
+  utmp->ut_exit.e_exit = utmpx->ut_exit.e_exit;
+#else
+  utmp->ut_exit.__e_termination = utmpx->ut_exit.e_termination;
+  utmp->ut_exit.__e_exit = utmpx->ut_exit.e_exit;
+#endif
+  utmp->ut_session = utmpx->ut_session;
+  utmp->ut_tv = utmpx->ut_tv;
+}
diff --git a/sysdeps/generic/getutmpx.c b/sysdeps/generic/getutmpx.c
new file mode 100644
index 0000000000..41dfeaed69
--- /dev/null
+++ b/sysdeps/generic/getutmpx.c
@@ -0,0 +1,40 @@
+/* Copyright (C) 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include <utmp.h>
+#include <utmpx.h>
+
+void
+getutmpx (const struct utmp *utmp, struct utmpx *utmpx)
+{
+  utmpx->ut_type = utmp->ut_type;
+  utmpx->ut_pid = utmp->ut_pid;
+  memcpy (utmpx->ut_line, utmp->ut_line, sizeof (utmpx->ut_line));
+  memcpy (utmpx->ut_id, utmp->ut_id, sizeof (utmpx->ut_id));
+  memcpy (utmpx->ut_user, utmp->ut_user, sizeof (utmpx->ut_user));
+  memcpy (utmpx->ut_host, utmp->ut_host, sizeof (utmpx->ut_host));
+#ifdef _GNU_SOURCE
+  utmpx->ut_exit.e_termination = utmp->ut_exit.e_termination;
+  utmpx->ut_exit.e_exit = utmp->ut_exit.e_exit;
+#else
+  utmpx->ut_exit.__e_termination = utmp->ut_exit.e_termination;
+  utmpx->ut_exit.__e_exit = utmp->ut_exit.e_exit;
+#endif
+  utmpx->ut_session = utmp->ut_session;
+  utmpx->ut_tv = utmp->ut_tv;
+}
diff --git a/sysdeps/gnu/Makefile b/sysdeps/gnu/Makefile
index 14a190acf6..4e814d93cd 100644
--- a/sysdeps/gnu/Makefile
+++ b/sysdeps/gnu/Makefile
@@ -31,7 +31,7 @@ endif
 
 ifeq ($(subdir),login)
 sysdep_routines += setutxent getutxent endutxent getutxid getutxline \
-                   pututxline utmpxname updwtmpx
+                   pututxline utmpxname updwtmpx getutmpx getutmp
 
 sysdep_headers += utmpx.h bits/utmpx.h
 endif
diff --git a/sysdeps/gnu/utmpx.h b/sysdeps/gnu/utmpx.h
index e9f2389b75..64fac6292c 100644
--- a/sysdeps/gnu/utmpx.h
+++ b/sysdeps/gnu/utmpx.h
@@ -60,6 +60,14 @@ extern int utmpxname __P ((__const char *__file));
 /* Append entry UTMP to the wtmpx-like file WTMPX_FILE.  */
 extern void updwtmpx __P ((__const char *__wtmpx_file,
 			   __const struct utmpx *__utmpx));
+
+/* Copy the information in UTMPX to UTMP. */
+extern void getutmp __P ((__const struct utmpx *__utmpx,
+			  struct utmp *__utmp));
+
+/* Copy the information in UTMP to UTMPX. */
+extern void getutmpx __P ((__const struct utmp *__utmp,
+			   struct utmpx *__utmpx));
 #endif
 
 __END_DECLS