From ee188d555b8c32ad9704a7440cab400af967292f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 5 Jun 1996 01:07:21 +0000 Subject: Tue Jun 4 21:01:20 1996 Roland McGrath * sysdeps/mach/hurd/getlogin_r.c: New file. Wed Jun 5 02:11:30 1996 Ulrich Drepper * io/Makefile (routines): Add ttyname_r. * resolv/res_debug.c, resolv/resolv.h: Update from bind-4.3.4-T4A. * sysdeps/libm-i387/e_asinl.S, sysdeps/libm-i387/e_atan2l.S, sysdeps/libm-i387/e_expl.S, sysdeps/libm-i387/e_fmodl.S, sysdeps/libm-i387/e_log10l.S, sysdeps/libm-i387/e_logl.S, sysdeps/libm-i387/e_remainderl.S, sysdeps/libm-i387/e_scalbl.S, sysdeps/libm-i387/e_sqrtl.S, sysdeps/libm-i387/s_atanl.S, sysdeps/libm-i387/s_cosl.S, sysdeps/libm-i387/s_ilogbl.S, sysdeps/libm-i387/s_log1pl.S, sysdeps/libm-i387/s_logbl.S, sysdeps/libm-i387/s_scalbnl.S, sysdeps/libm-i387/s_sinl.S, sysdeps/libm-i387/s_tanl.S: New files. i387 assembler versions of `long double' math functions. * sysdeps/libm-ieee754/k_standard.c: Add handling for errors in long double functions. * sysdeps/libm-ieee754/s_ilogbl.c, sysdeps/libm-ieee754/s_logbl.c, sysdeps/libm-ieee754/s_modfl.c: New files. Generic versions of `long double' math functions. * sysdeps/libm-ieee754/s_isinf.c [NO_LONG_DOUBLE]: Add string alias for __isinfl. * sysdeps/libm-ieee754/w_acoshl.c, sysdeps/libm-ieee754/w_acosl.c, sysdeps/libm-ieee754/w_asinl.c, sysdeps/libm-ieee754/w_atan2l.c, sysdeps/libm-ieee754/w_atanhl.c, sysdeps/libm-ieee754/w_cabsl.c, sysdeps/libm-ieee754/w_coshl.c, sysdeps/libm-ieee754/w_dreml.c, sysdeps/libm-ieee754/w_expl.c, sysdeps/libm-ieee754/w_fmodl.c, sysdeps/libm-ieee754/w_gammal.c, sysdeps/libm-ieee754/w_gammal_r.c, sysdeps/libm-ieee754/w_hypotl.c, sysdeps/libm-ieee754/w_j0l.c, sysdeps/libm-ieee754/w_j1l.c, sysdeps/libm-ieee754/w_jnl.c, sysdeps/libm-ieee754/w_lgammal.c, sysdeps/libm-ieee754/w_lgammal_r.c, sysdeps/libm-ieee754/w_log10l.c, sysdeps/libm-ieee754/w_logl.c, sysdeps/libm-ieee754/w_powl.c, sysdeps/libm-ieee754/w_remainderl.c, sysdeps/libm-ieee754/w_scalbl.c, sysdeps/libm-ieee754/w_sinhl.c, sysdeps/libm-ieee754/w_sqrtl.c: New files. Wrapper functions around long double function implementations. * sysdeps/posix/ttyname_r.c (ttyname_r): Use _D_EXACT_NAMLEN to determine length of directory entry name. * posix/Makefile (routines): Add getlogin_r. * posix/unistd.h: Add prototype for getlogin_r. * sysdeps/stub/getlogin_r.c: New file. Reentrant version of getlogin function, specified in P1003.1c/D6. Stub version. * sysdeps/unix/getlogin.c (getlogin): Use ttyname_r instead of ttyname. This avoids saving and restoring the old content. Also use setutent_r, getutline_r and endutent_r instead of accing UTMP file directly. * sysdeps/unix/getlogin_r.c: New file. Reentrant version of getlogin function, specified in P1003.1c/D6. Tue Jun 4 20:10:09 1996 J.T. Conklin * sysdeps/libm-i387/s_finitef.S: Fix mask for exponent. * elf/dl-lookup.c (_dl_lookup_symbol): Grok magical undefined symbols _GNU_libc_dl_{open,close,symbol} and resolve them to dl functions. * elf/rtld.c (rtld_map): Renamed to _dl_rtld_map, made global. * elf/link.h: Declare _dl_rtld_map. * elf/dl-lookup.c (_dl_symbol_value): New function. * elf/link.h: Declare it. stdio-common/vfscanf.c: Prepare for reentrant libio. Used in reentrant libio. --- sysdeps/unix/getlogin.c | 54 +++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 35 deletions(-) (limited to 'sysdeps/unix/getlogin.c') diff --git a/sysdeps/unix/getlogin.c b/sysdeps/unix/getlogin.c index 504a7aa..00baf68 100644 --- a/sysdeps/unix/getlogin.c +++ b/sysdeps/unix/getlogin.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996 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 @@ -17,7 +17,6 @@ not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include -#include #include #include #include @@ -27,38 +26,29 @@ Cambridge, MA 02139, USA. */ #include -/* Defined in ttyname.c. */ -extern char *__ttyname; - /* Return the login name of the user, or NULL if it can't be determined. The returned pointer, if not NULL, is good only until the next call. */ char * DEFUN_VOID(getlogin) { - char save_tty_pathname[2 + 2 * NAME_MAX]; - char *save_ttyname; - char *real_tty_path; + char tty_pathname[2 + 2 * NAME_MAX]; + char *real_tty_path = tty_pathname; char *result = NULL; - FILE *f; - static struct utmp ut; - - if (__ttyname == NULL) - save_ttyname = NULL; - else - save_ttyname = strcpy (save_tty_pathname, __ttyname); + static struct utmp_data utmp_data; + struct utmp *ut; { - int err; + int err = 0; int d = __open ("/dev/tty", 0); if (d < 0) return NULL; - real_tty_path = ttyname (d); - err = errno; + if (ttyname_r (d, real_tty_path, sizeof (tty_pathname)) < 0) + err = errno; (void) close (d); - if (real_tty_path == NULL) + if (errno != 0) { errno = err; return NULL; @@ -67,24 +57,18 @@ DEFUN_VOID(getlogin) real_tty_path += 5; /* Remove "/dev/". */ - f = fopen ("/etc/utmp", "r"); - if (f != NULL) + setutent_r (&utmp_data); + if (getutline_r (real_tty_path, &ut, &utmp_data) < 0) { - while (fread ((PTR) &ut, sizeof(ut), 1, f) == 1) - if (!strncmp (ut.ut_line, real_tty_path, sizeof (ut.ut_line))) - { - result = ut.ut_name; - /* The name is not null-terminated if - it is as long as sizeof (ut.ut_name). */ - result[sizeof (ut.ut_name)] = '\0'; - break; - } - (void) fclose (f); + if (errno == ESRCH) + /* The caller expects ENOENT if nothing is found. */ + errno = ENOENT; + result = NULL; } + else + result = ut->ut_line; + + endutent_r (&utmp_data); - if (save_ttyname != NULL) - strcpy (__ttyname, save_ttyname); - if (result == NULL) - errno = ENOENT; return result; } -- cgit v1.1