update from main archive 970127 cvs/libc-970128

1997-01-28 04:23  Ulrich Drepper  <drepper@cygnus.com>
	* version.h (VERSION): Bump to 2.0.1.
	* posix/getopt.c: Handle another problem introduced by the
	nonoption_flags array.  We must be able to work with reordered
	argv arrays.  Reported by Andreas Schwab.
1997-01-28 02:38  Ulrich Drepper  <drepper@cygnus.com>
	* sysdeps/unix/sysv/linux/i386/clone.S: Correct handling of new
1997-01-27 17:34  Thorsten Kukuk <kukuk@weber.uni-paderborn.de>
	* nis/rpcsvc/yp_prot.h: Correct definitions and types in file so
	that it works with yp.h.
1997-01-27 13:28  Ulrich Drepper  <drepper@cygnus.com>
	* malloc/malloc.h (__malloc_initialized) [_LIBC]: Define as
	__libc_malloc_initialized so that this variable is not shared with
	other users of GNU malloc.
	Suggested by Martin von Loewis <martin@mira.isdn.cs.tu-berlin.de>.
	* mcheck.h: Correct typo.  Use malloc/ instead of new-malloc/.
	* sysdeps/i386/Makefile (CFLAGS-dl-load.c, CFLAGS-dl-reloc.c): New
	variables to prevent warnings.
	* sysdeps/i386/dl-machine.h (fixup): Add prototype and declare
	using attribute regparm.
	(ELF_MACHINE_RUNTIME_TRAMPOLINE): Rewrite so that no register
	is changed by the resolver code.
1997-01-14 14:20  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
	* malloc/malloc.c (weak_variable): Define.
	(__malloc_initialize_hook, __free_hook, __malloc_hook, __realloc_hook,
	__memalign_hook): Make them weak definitions.
1997-01-26 11:35  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
	* sysdeps/unix/sysv/linux/getdents.c: Don't write beyond buffer
	limits, correctly take structure padding into account, use correct
	offset when resetting the stream, change heuristic to assume an
	average name length of 14 characters.
1997-01-25 18:06  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
	* sysdeps/unix/sysv/linux/alpha/termbits.h: Protect against multiple
	inclusion.
See ChangeLog.6 for earlier changes.

5 files changed, 53 insertions, 24 deletions

diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index e1dcd52052..36410f04f1 100644
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -7,4 +7,6 @@ long-double-fcts = yes
 
 ifeq ($(subdir),elf)
 CFLAGS-rtld.c += -Wno-uninitialized
+CFLAGS-dl-load.c += -Wno-unused
+CFLAGS-dl-reloc.c += -Wno-unused
 endif
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index dd820fd8c4..9af800cd48 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -1,5 +1,5 @@
 /* Machine-dependent ELF dynamic relocation inline functions.  i386 version.
-   Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997 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
@@ -70,6 +70,12 @@ elf_machine_load_address (void)
   (dynamic_info)[DT_RELSZ]->d_un.d_val -= sizeof (Elf32_Rel);
 
 
+/* We add a declaration of this function here so that in dl-runtime.c
+   the ELF_MACHINE_RUNTIME_TRAMPOLINE macro really can pass the parameters
+   in registers.  */
+static ElfW(Addr) fixup (struct link_map *l, ElfW(Word) reloc_offset)
+     __attribute__ ((regparm (2), unused));
+
 /* Set up the loaded object described by L so its unrelocated PLT
    entries will jump to the on-demand fixup code in dl-runtime.c.  */
 
@@ -92,15 +98,24 @@ elf_machine_runtime_setup (struct link_map *l, int lazy)
       got[2] = (Elf32_Addr) &_dl_runtime_resolve;
     }
 
+
   /* This code is used in dl-runtime.c to call the `fixup' function
      and then redirect to the address it returns.  */
 #define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\
 	.globl _dl_runtime_resolve
 	.type _dl_runtime_resolve, @function
 _dl_runtime_resolve:
-	call fixup	# Args pushed by PLT.
-	addl $8, %esp	# Pop args.
-	jmp *%eax	# Jump to function address.
+	pushl %eax		# Preserve registers otherwise clobbered.
+	pushl %ecx
+	pushl %edx
+	movl 16(%esp), %edx	# Copy args pushed by PLT in register.  Note
+	movl 12(%esp), %eax	# that `fixup' takes its parameters in regs.
+	call fixup		# Call resolver.
+	popl %edx		# Get register content back.
+	popl %ecx
+	xchgl %eax, (%esp)	# Get %eax contents end store function address.
+	ret $8			# Jump to function address.
+	.size _dl_runtime_resolve, .-_dl_runtime_resolve
 ");
 /* The PLT uses Elf32_Rel relocs.  */
 #define elf_machine_relplt elf_machine_rel
diff --git a/sysdeps/unix/sysv/linux/alpha/termbits.h b/sysdeps/unix/sysv/linux/alpha/termbits.h
index bcd3ff5d63..d0932c1cd7 100644
--- a/sysdeps/unix/sysv/linux/alpha/termbits.h
+++ b/sysdeps/unix/sysv/linux/alpha/termbits.h
@@ -17,6 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _TERMBITS_H
+#define _TERMBITS_H 1
+
 typedef unsigned char	cc_t;
 typedef unsigned int	speed_t;
 typedef unsigned int	tcflag_t;
@@ -186,3 +189,5 @@ struct termios
 
 #define _IOT_termios /* Hurd ioctl type field.  */ \
   _IOT (_IOTS (cflag_t), 4, _IOTS (cc_t), NCCS, _IOTS (speed_t), 2)
+
+#endif /* _TERMBITS_H */
diff --git a/sysdeps/unix/sysv/linux/getdents.c b/sysdeps/unix/sysv/linux/getdents.c
index 40b31617ef..b4b12d48eb 100644
--- a/sysdeps/unix/sysv/linux/getdents.c
+++ b/sysdeps/unix/sysv/linux/getdents.c
@@ -49,11 +49,11 @@ struct kernel_dirent
 
 /* The problem here is that we cannot simply read the next NBYTES
    bytes.  We need to take the additional field into account.  We use
-   some heuristic.  Assume the directory contains names with at least
-   3 characters we can compute a maximum number of entries which fit
-   in the buffer.  Taking this number allows us to specify a correct
-   number of bytes to read.  If we should be wrong, we can reset the
-   file descriptor.  */
+   some heuristic.  Assuming the directory contains names with 14
+   characters on average we can compute an estimate number of entries
+   which fit in the buffer.  Taking this number allows us to specify a
+   correct number of bytes to read.  If we should be wrong, we can reset
+   the file descriptor.  */
 ssize_t
 __getdirentries (fd, buf, nbytes, basep)
      int fd;
@@ -62,12 +62,16 @@ __getdirentries (fd, buf, nbytes, basep)
      off_t *basep;
 {
   off_t base = __lseek (fd, (off_t) 0, SEEK_CUR);
+  off_t last_offset = base;
   size_t red_nbytes;
   struct kernel_dirent *skdp, *kdp;
   struct dirent *dp;
   int retval;
+  const size_t size_diff = (offsetof (struct dirent, d_name)
+			    - offsetof (struct kernel_dirent, d_name));
 
-  red_nbytes = nbytes - (nbytes / (offsetof (struct dirent, d_name) + 3));
+  red_nbytes = nbytes - ((nbytes / (offsetof (struct dirent, d_name) + 14))
+			 * size_diff);
 
   dp = (struct dirent *) buf;
   skdp = kdp = __alloca (red_nbytes);
@@ -76,26 +80,29 @@ __getdirentries (fd, buf, nbytes, basep)
 
   while ((char *) kdp < (char *) skdp + retval)
     {
-      const size_t size_diff = MAX (offsetof (struct dirent, d_name)
-				    - offsetof (struct kernel_dirent, d_name),
-				    __alignof__ (struct dirent));
+      const size_t alignment = __alignof__ (struct dirent);
+      /* Since kdp->d_reclen is already aligned for the kernel structure
+	 this may compute a value that is bigger than necessary.  */
+      size_t new_reclen = ((kdp->d_reclen + size_diff + alignment - 1)
+			   & ~(alignment - 1));
+      if ((char *) dp + new_reclen > buf + nbytes)
+	{
+	  /* Our heuristic failed.  We read too many entries.  Reset
+	     the stream.  */
+	  __lseek (fd, last_offset, SEEK_SET);
+	  break;
+	}
+
+      last_offset = kdp->d_off;
       dp->d_ino = kdp->d_ino;
       dp->d_off = kdp->d_off;
-      dp->d_reclen = kdp->d_reclen + size_diff;
+      dp->d_reclen = new_reclen;
       dp->d_type = DT_UNKNOWN;
       memcpy (dp->d_name, kdp->d_name,
 	      kdp->d_reclen - offsetof (struct kernel_dirent, d_name));
 
-      dp = (struct dirent *) (((char *) dp) + dp->d_reclen);
+      dp = (struct dirent *) ((char *) dp + new_reclen);
       kdp = (struct kernel_dirent *) (((char *) kdp) + kdp->d_reclen);
-
-      if ((char *) dp >= buf + nbytes)
-	{
-	  /* Our heuristic failed.  We read too many entries.  Reset
-	     the stream.  */
-	  off_t used = ((char *) kdp - (char *) buf) - (nbytes - red_nbytes);
-	  base = __lseek (fd, retval - used, SEEK_CUR);
-	}
     }
 
   if (basep)
diff --git a/sysdeps/unix/sysv/linux/i386/clone.S b/sysdeps/unix/sysv/linux/i386/clone.S
index 541ae10f6a..3cdd2dc468 100644
--- a/sysdeps/unix/sysv/linux/i386/clone.S
+++ b/sysdeps/unix/sysv/linux/i386/clone.S
@@ -38,7 +38,7 @@ ENTRY(__clone)
 	jz	syscall_error
 
 	/* Insert the argument onto the new stack.  */
-	subl	$-8,%ecx
+	subl	$8,%ecx
 	movl	16(%esp),%eax		/* no negative argument counts */
 	movl	%eax,4(%ecx)