Tue Jun 4 21:01:20 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>

	* sysdeps/mach/hurd/getlogin_r.c: New file.

Wed Jun  5 02:11:30 1996  Ulrich Drepper  <drepper@cygnus.com>

	* 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  <jtc@cygnus.com>

	* 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.

2 files changed, 99 insertions, 35 deletions

diff --git a/sysdeps/unix/getlogin.c b/sysdeps/unix/getlogin.c
index 504a7aa4c0..00baf6875a 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 <ansidecl.h>
-#include <stddef.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
@@ -27,38 +26,29 @@ Cambridge, MA 02139, USA.  */
 
 #include <utmp.h>
 
-/* 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;
 }
diff --git a/sysdeps/unix/getlogin_r.c b/sysdeps/unix/getlogin_r.c
new file mode 100644
index 0000000000..15afdee63c
--- /dev/null
+++ b/sysdeps/unix/getlogin_r.c
@@ -0,0 +1,80 @@
+/* Reentrant function to return the current login name.  Unix version.
+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
+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., 675 Mass Ave,
+Cambridge, MA 02139, USA.  */
+
+#include <errno.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdio.h>
+#include <limits.h>
+#include <fcntl.h>
+
+#include <utmp.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 occured, return the error
+   code.  Otherwise return 0.  */
+
+int
+getlogin_r (name, name_len)
+     char *name;
+     size_t name_len;
+{
+  char tty_pathname[2 + 2 * NAME_MAX];
+  char *real_tty_path = tty_pathname;
+  int result = 0;
+  struct utmp_data utmp_data;
+  struct utmp *ut;
+
+  {
+    int err;
+    int d = __open ("/dev/tty", 0);
+    if (d < 0)
+      return errno;
+
+    result = ttyname_r (d, real_tty_path, sizeof (tty_pathname));
+    err = errno;
+    (void) close (d);
+
+    if (result < 0)
+      {
+	errno = err;
+	return err;
+      }
+  }
+
+  real_tty_path += 5;		/* Remove "/dev/".  */
+
+  setutent_r (&utmp_data);
+  if (getutline_r (real_tty_path, &ut, &utmp_data) < 0)
+    {
+      if (errno == ESRCH)
+	/* The caller expects ENOENT if nothing is found.  */
+	result = ENOENT;
+      else
+	result = errno;
+    }
+  else
+    {
+      strncpy (name, ut->ut_line, name_len);
+      result = 0;
+    }
+  endutent_r (&utmp_data);
+
+  return result;
+}