update from main archive 960927cvs/libc-961001cvs/libc-960929cvs/libc-960928

Sat Sep 28 03:02:49 1996  Ulrich Drepper  <drepper@cygnus.com>
	* dirent/Makefile (routines): Add readdir_r.
	* dirent/readdir_r.c: New file.  Wrapper around readdir.c.
	* dirent/dirent.h: Add prototype for readdir_r.
	* misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int'
	to prevent warnings.
	* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path):
 	Initialize `result'.

Sat Sep 28 01:16:42 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/generic/strsep.c: Rename to __strsep and make strsep
	weak alias.
	* string/string.h: Add prototype for __strsep.
	* misc/mntent_r.c: Use __strsep instead of strsep to keep
	namespace clean.

	* sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make
	__nanosleep and nanosleep weak aliases.
	* sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak
	alias.
	* sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of
	nanosleep to keep namespace clean.

	* sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning.
	* sysdeps/posix/ttyname_r.c (ttyname_r): Likewise.
	* sysdeps/posix/getcwd.c (__getcwd): Likewise.

	* sysdeps/unix/nlist.c: Use ISO C definition since we don't always
	have prototype.

	* login/Makefile (headers): Add pty.h.
	* login/pty.h: New file.
	* sysdeps/generic/pty.h: Include <pty.h>.
	* login/pututline_r.c: Add cast to prevent warning.

	* gmon/gmon.c: Add prototype for __profile_frequency.
	(monstartup): Add cast to prevent warning.
	* sysdeps/generic/prof-freq.c: Change to use ISO C style definition.

	* locale/programs/ld-time.c (time_output): Write `era' information
	in correct order.

Sat Sep 28 00:11:08 1996  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/syscalls.list: Add weak alias
	`adjtimex'.
	Set caller for mlock, mlockall, mremap, munlock, and munlockall
	to EXTRA.
	Reported by Matthias Urlichs <smurf@smurf.noris.de>.

1996-09-27  Paul Eggert  <eggert@twinsun.com>

	* strftime.c (strftime): Output incomplete formats like %E
	at end of string.

1996-09-27  Paul Eggert  <eggert@twinsun.com>

	* strftime.c (strftime): Add support for %EC and %Ey.
	Fix support for %EY.  This uses the new _nl_get_era_entry function.

Fri Sep 27 14:12:27 1996  Ulrich Drepper  <drepper@cygnus.com>

	Security related patch by Elliot Lee <sopwith@redhat.com> and
	David Holland <dholland@eecs.harvard.edu>.

	* inet/rexec.c (rexec): Increase size of `num' array from 8 to 32.
	* inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist.

	* sysdeps/generic/getenv.c (__secure_getenv): New function.  Return
	NULL when programs runs with SUID or SGID enabled.
	* sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv.
	* stdlib/stdlib.h: Add prototype for __secure_getenv.

	* locale/setlocale.c: Use __secure_getenv.
	* resolv/res_init.c: Likewise.
	* resolv/res_query.c: Likewise.
	* inet/ruserpass.c: Likewise.
	* sysdeps/posix/tempname.c: Likewise.
	* malloc/mtrace.c: Likewise.
	* catgets/catgets.c: Likewise.

	Make temporary file handling functions reentrant.

	* stdio-common/tmpnam.c: Rewrite to have own buffer to write
	result to.  The called __stdio_gen_tempname function must be
	thread safe.
	* stdio-common/tmpnam_r.c: New file.
	* stdio/stdio.h: Add prototype for `tmpnam_r'.
	Change prototype for __stdio_gen_tempname.
	* stdio/libio.h: Likewise.
	* sysdeps/posix/tempname.c: Add new parameters and use them instead
	of static buffer.
	Don't reset `indeces' when PID changed between calls.
	Don't fail for long running programs when index counter once
	reached the limit.
	* sysdeps/stub/tempname.c: Likewise.
	* stdio-common/tempnam.c: Provide local buffer as extra argument
	to __stdio_gen_tempname.  This makes this function reentrant.
	* stdio-common/tmpfile.c: Likewise.
	* stdio-common/temptest.c: Provide extra argument to
	__stdio_gen_tempname.
	* manual/filesys.texi: Describe tmpnam_r and add comments about
	reentrancy of the functions.

	* inet/rcmd.c: Fixed address length handling.

	* sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value.

	* time/strftime.c: Remove unused variables alt_digits and
 	end_alt_digits.

	* sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names
	for get_nprocs and get_nprocs_conf.
	* sysdeps/generic/sys/sysinfo.h: Likewise.

	* stdlib/test-canon.c: Finally do the right fix.

	* misc/Makefile: Only compile force-wrapper when compiling
	reentrant libc.

52 files changed, 547 insertions, 197 deletions

diff --git a/ChangeLog b/ChangeLog
index d28ec2d9d1..decbf31275 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,126 @@
-Mon Sep 23 15:31:04 1996  Thomas Bushnell, n/BSG  <thomas@gnu.ai.mit.edu>
+Sat Sep 28 03:02:49 1996  Ulrich Drepper  <drepper@cygnus.com>
 
-	* hurd/Makefile ($(includedir)/rpc/netdb.h): There is no make
-	variable `top_srcdir' in libc; use $(..) instead.
+	* dirent/Makefile (routines): Add readdir_r.
+	* dirent/readdir_r.c: New file.  Wrapper around readdir.c.
+	* dirent/dirent.h: Add prototype for readdir_r.
 
-	* sysdeps/mach/hurd/Makefile (rtld-installed-name): Delete special
-	definition.  It was a *Mistake*.  (With a capital M.)
+	* misc/hsearch_r.c (ENTRY): Make field `used' of type `unsigned int'
+	to prevent warnings.
 
-	* sysdeps/mach/getsysstats.c (__get_nprocs): Renamed from
-	__get_nproc.
-	(__get_nprocs_conf): Renamed from __get_nproc_conf.
+	* sysdeps/unix/sysv/linux/getsysstats.c (get_proc_path):
+ 	Initialize `result'.
+
+Sat Sep 28 01:16:42 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/generic/strsep.c: Rename to __strsep and make strsep
+	weak alias.
+	* string/string.h: Add prototype for __strsep.
+	* misc/mntent_r.c: Use __strsep instead of strsep to keep
+	namespace clean.
+
+	* sysdeps/stub/nanosleep.c: Rename to __libc_nanosleep and make
+	__nanosleep and nanosleep weak aliases.
+	* sysdeps/unix/sysv/linux/syscalls.list: Add __nanosleep as weak
+	alias.
+	* sysdeps/unix/sysv/linux/sleep.c: Call __nanosleep instead of
+	nanosleep to keep namespace clean.
+
+	* sysdeps/posix/ttyname.c (ttyname): Add cast to prevent warning.
+	* sysdeps/posix/ttyname_r.c (ttyname_r): Likewise.
+	* sysdeps/posix/getcwd.c (__getcwd): Likewise.
+
+	* sysdeps/unix/nlist.c: Use ISO C definition since we don't always
+	have prototype.
+
+	* login/Makefile (headers): Add pty.h.
+	* login/pty.h: New file.
+	* sysdeps/generic/pty.h: Include <pty.h>.
+	* login/pututline_r.c: Add cast to prevent warning.
+
+	* gmon/gmon.c: Add prototype for __profile_frequency.
+	(monstartup): Add cast to prevent warning.
+	* sysdeps/generic/prof-freq.c: Change to use ISO C style definition.
+
+	* locale/programs/ld-time.c (time_output): Write `era' information
+	in correct order.
+
+Sat Sep 28 00:11:08 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/syscalls.list: Add weak alias
+	`adjtimex'.
+	Set caller for mlock, mlockall, mremap, munlock, and munlockall
+	to EXTRA.
+	Reported by Matthias Urlichs <smurf@smurf.noris.de>.
+
+1996-09-27  Paul Eggert  <eggert@twinsun.com>
+
+	* strftime.c (strftime): Output incomplete formats like %E
+	at end of string.
+
+1996-09-27  Paul Eggert  <eggert@twinsun.com>
+
+	* strftime.c (strftime): Add support for %EC and %Ey.
+	Fix support for %EY.  This uses the new _nl_get_era_entry function.
+
+Fri Sep 27 14:12:27 1996  Ulrich Drepper  <drepper@cygnus.com>
+
+	Security related patch by Elliot Lee <sopwith@redhat.com> and
+	David Holland <dholland@eecs.harvard.edu>.
+
+	* inet/rexec.c (rexec): Increase size of `num' array from 8 to 32.
+	* inet/ruserpass.c (ruserpass): Don't allow $HOME envvar to not exist.
+
+	* sysdeps/generic/getenv.c (__secure_getenv): New function.  Return
+	NULL when programs runs with SUID or SGID enabled.
+	* sysdeps/stub/getenv.c: Make __secure_getenv an alias of getenv.
+	* stdlib/stdlib.h: Add prototype for __secure_getenv.
+
+	* locale/setlocale.c: Use __secure_getenv.
+	* resolv/res_init.c: Likewise.
+	* resolv/res_query.c: Likewise.
+	* inet/ruserpass.c: Likewise.
+	* sysdeps/posix/tempname.c: Likewise.
+	* malloc/mtrace.c: Likewise.
+	* catgets/catgets.c: Likewise.
+
+	Make temporary file handling functions reentrant.
+
+	* stdio-common/tmpnam.c: Rewrite to have own buffer to write
+	result to.  The called __stdio_gen_tempname function must be
+	thread safe.
+	* stdio-common/tmpnam_r.c: New file.
+	* stdio/stdio.h: Add prototype for `tmpnam_r'.
+	Change prototype for __stdio_gen_tempname.
+	* stdio/libio.h: Likewise.
+	* sysdeps/posix/tempname.c: Add new parameters and use them instead
+	of static buffer.
+	Don't reset `indeces' when PID changed between calls.
+	Don't fail for long running programs when index counter once
+	reached the limit.
+	* sysdeps/stub/tempname.c: Likewise.
+	* stdio-common/tempnam.c: Provide local buffer as extra argument
+	to __stdio_gen_tempname.  This makes this function reentrant.
+	* stdio-common/tmpfile.c: Likewise.
+	* stdio-common/temptest.c: Provide extra argument to
+	__stdio_gen_tempname.
+	* manual/filesys.texi: Describe tmpnam_r and add comments about
+	reentrancy of the functions.
+
+	* inet/rcmd.c: Fixed address length handling.
+
+	* sysdeps/posix/mk-stdiolim.c: Count final \0 byte in L_tmpnam value.
+
+	* time/strftime.c: Remove unused variables alt_digits and
+ 	end_alt_digits.
+
+	* sysdeps/unix/sysv/linux/sys/sysinfo.h: Correct prototype names
+	for get_nprocs and get_nprocs_conf.
+	* sysdeps/generic/sys/sysinfo.h: Likewise.
+
+	* stdlib/test-canon.c: Finally do the right fix.
+
+	* misc/Makefile: Only compile force-wrapper when compiling
+	reentrant libc.
 
 Fri Sep 27 03:49:56 1996  Ulrich Drepper  <drepper@cygnus.com>
 
diff --git a/catgets/catgets.c b/catgets/catgets.c
index 0abc182414..7c45b4569a 100644
--- a/catgets/catgets.c
+++ b/catgets/catgets.c
@@ -79,7 +79,7 @@ catopen (const char *cat_name, int flag)
 	  return (nl_catd) -1;
 	}
 
-      if (getenv ("NLSPATH") != NULL)
+      if (__secure_getenv ("NLSPATH") != NULL)
 	result->nlspath = __strdup (getenv ("NLSPATH"));
       else
 	result->nlspath = __strdup (NLSPATH);
diff --git a/dirent/Makefile b/dirent/Makefile
index b6a42190eb..8d706dfe64 100644
--- a/dirent/Makefile
+++ b/dirent/Makefile
@@ -22,7 +22,7 @@
 subdir		:= dirent
 
 headers		:= dirent.h direntry.h
-routines	:= opendir closedir readdir rewinddir \
+routines	:= opendir closedir readdir readdir_r rewinddir \
 		   seekdir telldir scandir alphasort \
 		   getdents dirfd
 distribute := dirstream.h
diff --git a/dirent/dirent.h b/dirent/dirent.h
index 02a5e6a18a..06e92cb6b9 100644
--- a/dirent/dirent.h
+++ b/dirent/dirent.h
@@ -116,6 +116,13 @@ extern int closedir __P ((DIR * __dirp));
 extern struct dirent *__readdir __P ((DIR * __dirp));
 extern struct dirent *readdir __P ((DIR * __dirp));
 
+#ifdef __USE_REENTRANT
+/* Reentrant versio of `readdir'.  Return in RESULT a pointer to the
+   next entry.  */
+extern int readdir_r __P ((DIR *__dirp, struct dirent *entry,
+			   struct dirent **result));
+#endif
+
 /* Rewind DIRP to the beginning of the directory.  */
 extern void rewinddir __P ((DIR * __dirp));
 
diff --git a/dirent/readdir_r.c b/dirent/readdir_r.c
new file mode 100644
index 0000000000..b9979660fa
--- /dev/null
+++ b/dirent/readdir_r.c
@@ -0,0 +1,37 @@
+/* readdir_r - Reentrant version of readdir.
+Copyright (C) 1996 Free Software Foundation, Inc.
+This file is part of the GNU C Library.
+Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
+
+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 <dirent.h>
+
+/* Some systems have reentrancy problems with their `readdir'
+   implementation so they have an additional `readdir_r' version.  The
+   GNU version does not have these problems but for compatibility
+   reasons we provide this function.  It is simply a wrapper around
+   the normal function.
+
+   The actual definition of this functions varies very strong from
+   system to system.  We chose to follow the POSIX version.  */
+int
+readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result)
+{
+  *result = readdir (dirp);
+
+  return *result != NULL ? 0 : -1;
+}
diff --git a/gmon/gmon.c b/gmon/gmon.c
index a450d11365..ecf7518bfb 100644
--- a/gmon/gmon.c
+++ b/gmon/gmon.c
@@ -45,6 +45,8 @@
 #include <string.h>
 #include <unistd.h>
 
+extern int __profile_frequency (void);
+
 struct __bb *__bb_head;	/*  Head of basic-block list or NULL. */
 
 struct gmonparam _gmonparam = { GMON_PROF_OFF };
@@ -128,7 +130,7 @@ DEFUN(monstartup, (lowpc, highpc), u_long lowpc AND u_long highpc)
   p->tos[0].link = 0;
 
   o = p->highpc - p->lowpc;
-  if (p->kcountsize < o)
+  if (p->kcountsize < (u_long) o)
     {
 #ifndef hp300
       s_scale = ((float)p->kcountsize / o ) * SCALE_1_TO_1;
diff --git a/inet/rcmd.c b/inet/rcmd.c
index 1c63e952dc..a9756d109a 100644
--- a/inet/rcmd.c
+++ b/inet/rcmd.c
@@ -52,6 +52,9 @@ static char sccsid[] = "@(#)rcmd.c	8.3 (Berkeley) 3/26/94";
 #include <ctype.h>
 #include <string.h>
 
+#define MIN(A, B) ((A) < (B) ? (A) : (B))<