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.
This commit is contained in:
Ulrich Drepper
parent
71377958c8
commit
6eb857c788
15
ChangeLog
15
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
|
||||
|
|
|
|||
|
|
@ -32,6 +32,10 @@ libc {
|
|||
# u*
|
||||
unlockpt; updwtmpx; utmpxname;
|
||||
}
|
||||
GLIBC_2.1.1 {
|
||||
# g*
|
||||
getutmpx; getutmp;
|
||||
}
|
||||
}
|
||||
|
||||
libutil {
|
||||
|
|
|
|||
40
sysdeps/generic/getutmp.c
Normal file
40
sysdeps/generic/getutmp.c
Normal file
|
|
@ -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;
|
||||
}
|
||||
40
sysdeps/generic/getutmpx.c
Normal file
40
sysdeps/generic/getutmpx.c
Normal file
|
|
@ -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;
|
||||
}
|
||||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in a new issue