aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/unix/getlogin_r.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-10-16 03:03:00 +0000
committerRoland McGrath <roland@gnu.org>2002-10-16 03:03:00 +0000
commitabe7b661ff7a361c9fe11789bab068e44de849b0 (patch)
tree2d1f05a2896d87ddeb83d344b2dc1c818a392149 /sysdeps/unix/getlogin_r.c
parentc55dca8d85b4585f3e72eb72a9c1164568a68472 (diff)
downloadglibc-abe7b661ff7a361c9fe11789bab068e44de849b0.tar
glibc-abe7b661ff7a361c9fe11789bab068e44de849b0.tar.gz
glibc-abe7b661ff7a361c9fe11789bab068e44de849b0.tar.bz2
glibc-abe7b661ff7a361c9fe11789bab068e44de849b0.zip
Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/Makefile ($(objpfx)syscall-%.h $(objpfx)syscall-%.d): Take code from sparc/Makefile to produce a bi-arch file as needed. That's now parameterized by the variable $(64bit-predefine). Use LC_ALL=C for `comm' commands in that rule. No longer conditional on [$(no_syscall_list_h)]. * sysdeps/unix/sysv/linux/sparc/Makefile: Remove replacement rules. (64bit-predefine): New variable. * sysdeps/unix/sysv/linux/x86_64/Makefile: Likewise. * sysdeps/unix/sysv/linux/s390/Makefile: New file. * sysdeps/unix/sysv/linux/powerpc/Makefile (64bit-predefine): New variable. 2002-10-15 Roland McGrath <roland@redhat.com> * sysdeps/unix/sysv/linux/Makefile ($(objpfx)syscall-%.h $(objpfx)syscall-%.d) * login/utmp-private.h: Declare __libc_utmp_lock. * sysdeps/unix/getlogin_r.c (getlogin_r): Take __libc_utmp_lock once call __libc_utmp_jump_table functions directly, instead of using __setutent et al. * sysdeps/unix/sysv/linux/configure.in: Use case instead of if. * sysdeps/unix/sysv/linux/configure: Regenerated.
Diffstat (limited to 'sysdeps/unix/getlogin_r.c')
-rw-r--r--sysdeps/unix/getlogin_r.c22
1 files changed, 16 insertions, 6 deletions
diff --git a/sysdeps/unix/getlogin_r.c b/sysdeps/unix/getlogin_r.c
index b50776859f..ba7badd054 100644
--- a/sysdeps/unix/getlogin_r.c
+++ b/sysdeps/unix/getlogin_r.c
@@ -25,6 +25,7 @@
#include <fcntl.h>
#include <utmp.h>
+#include "../login/utmp-private.h"
/* Return at most NAME_LEN characters of the login name of the user in NAME.
If it cannot be determined or some other error occurred, return the error
@@ -37,7 +38,7 @@ getlogin_r (name, name_len)
{
char tty_pathname[2 + 2 * NAME_MAX];
char *real_tty_path = tty_pathname;
- int result = 0;
+ int result;
struct utmp *ut, line, buffer;
/* Get name of tty connected to fd 0. Return if not a tty or
@@ -56,10 +57,16 @@ getlogin_r (name, name_len)
return result;
real_tty_path += 5; /* Remove "/dev/". */
-
- __setutent ();
strncpy (line.ut_line, real_tty_path, sizeof line.ut_line);
- if (__getutline_r (&line, &buffer, &ut) < 0)
+
+ /* We don't use the normal entry points __setutent et al, because we
+ want setutent + getutline_r + endutent all to happen with the lock
+ held so that our search is thread-safe. */
+
+ __libc_lock_lock (__libc_utmp_lock);
+ (*__libc_utmp_jump_table->setutent) ();
+ result = (*__libc_utmp_jump_table->getutline_r) (&line, &buffer, &ut);
+ if (result < 0)
{
if (errno == ESRCH)
/* The caller expects ENOENT if nothing is found. */
@@ -67,7 +74,11 @@ getlogin_r (name, name_len)
else
result = errno;
}
- else
+ (*__libc_utmp_jump_table->endutent) ();
+ __libc_utmp_jump_table = &__libc_utmp_unknown_functions;
+ __libc_lock_unlock (__libc_utmp_lock);
+
+ if (result == 0)
{
size_t needed = strlen (ut->ut_user) + 1;
@@ -82,7 +93,6 @@ getlogin_r (name, name_len)
result = 0;
}
}
- __endutent ();
return result;
}