diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1996-11-29 02:24:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1996-11-29 02:24:43 +0000 |
| commit | a401eea9eb827caa393c3206fa6f3939ea067e94 (patch) | |
| tree | 00c4ab2ea24a7556b9d1e7a809743aa421ee5188 /login | |
| parent | c66452515d7b4ebf6b0633735397db9a392a839e (diff) | |
| download | glibc-a401eea9eb827caa393c3206fa6f3939ea067e94.zip glibc-a401eea9eb827caa393c3206fa6f3939ea067e94.tar.gz glibc-a401eea9eb827caa393c3206fa6f3939ea067e94.tar.bz2 | |
update from main archive 961127cvs/libc-961201cvs/libc-961130cvs/libc-961129
Thu Nov 28 23:03:32 1996 Ulrich Drepper <drepper@cygnus.com>
* sysdeps/unix/sysv/linux/netinet/in_systm.h: New file.
* sysdeps/unix/sysv/linux/Dist: Add netinet/in_systm.h.
* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
Add netinet/in_systm.h.
Reported by NIIBE Yutaka <gniibe@mri.co.jp>.
* sysdeps/unix/sysv/linux/i386/brk.c: Reformat copyright.
Diffstat (limited to 'login')
| -rw-r--r-- | login/getutent_r.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/login/getutent_r.c b/login/getutent_r.c index df9a797..580dcff 100644 --- a/login/getutent_r.c +++ b/login/getutent_r.c @@ -27,17 +27,15 @@ #include <stdlib.h> #include <string.h> #include <utmp.h> -#include <gnu/lib-names.h> #include <sys/stat.h> #include "utmp-private.h" -#include "../elf/link.h" /* The various backends we have. */ static int __setutent_unknown (int reset); static int __getutent_r_unknown (struct utmp *buffer, struct utmp **result); -static void __pututline_unknown (const struct utmp *data); +static struct utmp *__pututline_unknown (const struct utmp *data); static void __endutent_unknown (void); @@ -142,24 +140,29 @@ __getutent_r_unknown (struct utmp *buffer, struct utmp **result) } -void +struct utmp * __pututline (const struct utmp *data) { + struct utmp *buffer; + __libc_lock_lock (__libc_utmp_lock); - (*__libc_utmp_jump_table->pututline) (data); + buffer = (*__libc_utmp_jump_table->pututline) (data); __libc_lock_unlock (__libc_utmp_lock); + + return buffer; } +weak_alias (__pututline, pututline) -static void +static struct utmp * __pututline_unknown (const struct utmp *data) { /* It is not yet initialized. */ __setutent_unknown (0); - (*__libc_utmp_jump_table->pututline) (data); + return (*__libc_utmp_jump_table->pututline) (data); } |