update from main archive 961203

Tue Dec  3 08:38:15 1996  Richard Henderson  <rth@tamu.edu>

	* sysdeps/unix/alpha/sysdep.S: Remove definition of __errno_location.
	Reformat copyright.

	* elf/rtld.c (_dl_start): Don't dereference the value returned by
	elf_machine_got to get _DYNAMIC, instead call new function
	elf_machine_dynamic.
	* sysdeps/alpha/dl-machine.h: Permute elf_machine_got to
	elf_machine_dynamic.  Reformat copyright.
	* sysdeps/i386/dl-machine.h: Likewise.
	* sysdeps/m68k/dl-machine.h: Likewise.
	* sysdeps/mips/dl-machine.h: Likewise.
	* sysdeps/sparc/dl-machine.h: Likewise.
	* sysdeps/stub/dl-machine.h: Likewise.

Tue Oct 15 23:46:00 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* MakeTAGS (sysdep_dirs): Include add-on sysdep directories.

Tue Dec  3 02:06:18 1996  Ulrich Drepper  <drepper@cygnus.com>

	* Makerules ($(libdir)/libc.so): Make first line of generated
	link script contain `/* GNU ld script'.  This will be used in
	ldconfig to check for linker scripts.
	* sysdeps/mach/hurd/libc-ldscript: Likewise.
	* sysdeps/mach/hurd/libc_p-ldscript: Likewise.

	* stdlib/getsubopt.c: Update copyright.  Correct typo in comment.

3 files changed, 44 insertions, 45 deletions

diff --git a/io/fts.c b/io/fts.c
index 5e57eaf1b6..cfc8fa656d 100644
--- a/io/fts.c
+++ b/io/fts.c
@@ -570,7 +570,7 @@ fts_build(sp, type)
 	register FTS *sp;
 	int type;
 {
-	register struct dirent *dp;
+	register struct dirent dirbuf, *dp;
 	register FTSENT *p, *head;
 	register int nitems;
 	FTSENT *cur, *tail;
@@ -660,7 +660,8 @@ fts_build(sp, type)
 
 	/* Read the directory, attaching each entry to the `link' pointer. */
 	adjaddr = NULL;
-	for (head = tail = NULL, nitems = 0; dp = readdir(dirp);) {
+	for (head = tail = NULL, nitems = 0;
+	     __readdir_r (dirp, &dirbuf, &dp) >= 0;) {
 		int namlen;
 
 		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
diff --git a/io/ftw.c b/io/ftw.c
index b8d745b8d3..b7983d4525 100644
--- a/io/ftw.c
+++ b/io/ftw.c
@@ -1,23 +1,22 @@
 /* Copyright (C) 1992, 1995, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
-Contributed by Ian Lance Taylor (ian@airs.com).
+   This file is part of the GNU C Library.
+   Contributed by Ian Lance Taylor (ian@airs.com).
 
-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 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.
+   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.  */
+   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 <ansidecl.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -36,20 +35,17 @@ Cambridge, MA 02139, USA.  */
 /* Traverse one level of a directory tree.  */
 
 static int
-DEFUN (ftw_dir, (dirs, level, descriptors, dir, len, func),
-       DIR **dirs AND int level AND int descriptors AND
-       char *dir AND size_t len AND
-       int EXFUN((*func), (CONST char *file, struct stat *status,
-			   int flag)))
+ftw_dir (DIR **dirs, int level, int descriptors, char *dir, size_t len,
+	 int (*func) (const char *file, struct stat *status, int flag))
 {
   int got;
-  struct dirent *entry;
+  struct dirent dirbuf, *entry;
 
   got = 0;
 
   __set_errno (0);
 
-  while ((entry = readdir (dirs[level])) != NULL)
+  while (__readdir_r (dirs[level], &dirbuf, &entry) >= 0)
     {
       struct stat s;
       int flag, retval, newlev;
@@ -78,7 +74,7 @@ DEFUN (ftw_dir, (dirs, level, descriptors, dir, len, func),
 	}
 
       dir[len] = '/';
-      memcpy ((PTR) (dir + len + 1), (PTR) entry->d_name,
+      memcpy ((void *) (dir + len + 1), (void *) entry->d_name,
 	      namlen + 1);
 
       if (stat (dir, &s) < 0)
@@ -140,7 +136,7 @@ DEFUN (ftw_dir, (dirs, level, descriptors, dir, len, func),
 	  while (skip-- != 0)
 	    {
 	      __set_errno (0);
-	      if (readdir (dirs[level]) == NULL)
+	      if (__readdir_r (dirs[level], &dirbuf, &entry) < 0)
 		return errno == 0 ? 0 : -1;
 	    }
 	}
@@ -154,11 +150,9 @@ DEFUN (ftw_dir, (dirs, level, descriptors, dir, len, func),
 /* Call a function on every element in a directory tree.  */
 
 int
-DEFUN(ftw, (dir, func, descriptors),
-      CONST char *dir AND
-      int EXFUN((*func), (CONST char *file, struct stat *status,
-			  int flag)) AND
-      int descriptors)
+ftw (const char *dir,
+     int (*func) (const char *file, struct stat *status, int flag),
+     int descriptors)
 {
   DIR **dirs;
   size_t len;
@@ -197,7 +191,7 @@ DEFUN(ftw, (dir, func, descriptors),
     flag = FTW_F;
 
   len = strlen (dir);
-  memcpy ((PTR) buf, (PTR) dir, len + 1);
+  memcpy ((void *) buf, (void *) dir, len + 1);
 
   retval = (*func) (buf, &s, flag);
 
diff --git a/io/getwd.c b/io/getwd.c
index 00825ee0b0..4488cef00e 100644
--- a/io/getwd.c
+++ b/io/getwd.c
@@ -1,20 +1,20 @@
 /* Copyright (C) 1991, 1992, 1996 Free Software Foundation, Inc.
-This file is part of the GNU C Library.
+   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 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.
+   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.  */
+   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 <errno.h>
 #include <limits.h>
@@ -43,7 +43,11 @@ getwd (buf)
 
   if (getcwd (fetchbuf, PATH_MAX) == NULL)
     {
+#if defined HAVE_STRERROR_R || defined _LIBC
+      __strerror_r (errno, buf, PATH_MAX);
+#else
       strncpy (buf, strerror (errno), PATH_MAX);
+#endif
       return NULL;
     }