Mon Feb 26 10:22:30 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu>cvs/libc-960227

	* sysdeps/unix/dirstream.h: Rewritten.
	* sysdeps/unix/readdir.c: Rewritten.
	* sysdeps/unix/telldir.c: Rewritten.
	* sysdeps/unix/closedir.c: Use <...> instead of "..." for dirstream.h.
	Remove __ from DIR struct member names.
	* sysdeps/unix/dirfd.c: Likewise.
	* sysdeps/unix/seekdir.c: Likewise.
	* sysdeps/unix/rewinddir.c: Likewise.
	* sysdeps/unix/opendir.c: Likewise.  Don't allocate extra space after
	DIR structure.
	* sysdeps/stub/direct.h: File removed.
	* sysdeps/unix/bsd/bsd4.4/direct.h: File removed.
	* sysdeps/unix/bsd/direct.h: File removed.
	* sysdeps/unix/common/direct.h: File removed.
	* sysdeps/unix/sysv/irix4/direct.h: File removed.
	* sysdeps/unix/sysv/isc3/direct.h: File removed.
	* sysdeps/unix/sysv/sco3.2.4/direct.h: File removed.
	* sysdeps/unix/sysv/sysv4/solaris2/direct.h: File removed.
	* sysdeps/unix/common/direntry.h: New file.
	* sysdeps/unix/bsd/direntry.h: New file.
	* sysdeps/unix/bsd/bsd4.4/direntry.h: New file.
	* sysdeps/unix/sysv/direntry.h: New file.
	* sysdeps/stub/direntry.h: New file.
	* dirent/dirent.h (struct dirent): Type removed.  Include <direntry.h>
	to define it.
	(_D_EXACT_NAMLEN, _D_ALLOC_NAMLEN): New macros.
	* dirent/Makefile (headers): Add direntry.h.
	(distribute): Remove direct.h.
	* sysdeps/posix/getcwd.c: Use new macros instead of d_namlen.
	* dirent/scandir.c: Likewise.
	* io/fts.c (fts_build): Likewise.
	* io/ftw.c (ftw_dir): Likewise.
	* sysdeps/posix/ttyname.c: Likewise.

	* sysdeps/unix/sysv/sysv4/solaris2/syscalls.list: New file.

	* sysdeps/mach/hurd/profil.c (MAX_PC_SAMPLES): New macro.
	(collector_timeout): New static variable.
	(update_waiter): Actually call __task_enable_pc_sampling.
	Set collector_timeout based on the `tick' count returned.
	(profile_waiter): Use MAX_PC_SAMPLES.  Set nsamples before RPC.
	Use collector_timeout in __mach_msg call.

	* gmon/Makefile (noprof): New variable containing mcount.
	Append profil unless it is in $(unix-syscalls).
	(mcount.po): Use $(noprof) for list of targets in this rule.

	* libc-symbols.h: Define _LIBC before #include <config.h>.

Sun Feb 25 12:29:23 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>

	* config.h.in [_LIBC] (HAVE_STRERROR): Define it.
	Protect 2nd page of #undef's for generator programs with #ifndef _LIBC.

	* time/zic.c, time/zdump.c, time/private.h: Updated from ADO's latest.

Fri Feb  9 12:40:19 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>

 	* libio/cleanup.c (_IO_cleanup_registration_needed)
	[!_G_HAVE_ATEXIT]: Init to NULL.
	* libio/filedoalloc.c (_IO_cleanup_registration_needed): Remove decl.

Thu Feb  8 08:12:50 1996  Brendan Kehoe  <brendan@cygnus.com>

	* libio/filedoalloc.c (_IO_cleanup_registration_needed): Revert
	previous change, since cleanup.c only defines it if _G_HAVE_ATEXIT.

Wed Feb  7 15:10:17 1996  Brendan Kehoe  <brendan@lisa.cygnus.com>

	* libio/filedoalloc.c (_IO_cleanup_registration_needed): Declare as
	extern.

Sat Feb 24 11:34:13 1996  Roland McGrath  <roland@charlie-brown.gnu.ai.mit.edu>

	* sysdeps/i386/memcmp.S: Fix argument %esp offsets.

	* time/sys/time.h (timeradd, timersub): New macros; BSD has these.

18 files changed, 269 insertions, 115 deletions

diff --git a/sysdeps/i386/memcmp.S b/sysdeps/i386/memcmp.S
index f16b44a1b4..3917a329d6 100644
--- a/sysdeps/i386/memcmp.S
+++ b/sysdeps/i386/memcmp.S
@@ -1,6 +1,6 @@
 /* memcmp -- compare two memory blocks for differences in the first COUNT
 	     bytes.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 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
@@ -34,9 +34,9 @@ ENTRY (memcmp)
 	movl %edi, %edx		/* Note that %edx is not used and can
 				   so be used to save %edi.  It's faster.  */
 
-	movl 12(%esp), %esi	/* Load address of block #1.  */
-	movl 16(%esp), %edi	/* Load address of block #2.  */
-	movl 20(%esp), %ecx	/* Load maximal length of compare area.  */
+	movl 8(%esp), %esi	/* Load address of block #1.  */
+	movl 12(%esp), %edi	/* Load address of block #2.  */
+	movl 16(%esp), %ecx	/* Load maximal length of compare area.  */
 
 	cld			/* Set direction of comparison.  */
 
diff --git a/sysdeps/mach/hurd/profil.c b/sysdeps/mach/hurd/profil.c
index 43456ec628..431982e498 100644
--- a/sysdeps/mach/hurd/profil.c
+++ b/sysdeps/mach/hurd/profil.c
@@ -1,5 +1,5 @@
 /* Low-level statistical profiling support function.  Mach/Hurd version.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 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
@@ -26,6 +26,8 @@ Cambridge, MA 02139, USA.  */
 #include <cthreads.h>
 #include <assert.h>
 
+#define MAX_PC_SAMPLES	512	/* XXX ought to be exported in kernel hdr */
+
 static thread_t profile_thread = MACH_PORT_NULL;
 static u_short *samples;
 static size_t maxsamples;
@@ -33,6 +35,7 @@ static size_t pc_offset;
 static size_t sample_scale;
 static sampled_pc_seqno_t seqno;
 static struct mutex lock = MUTEX_INITIALIZER;
+static mach_msg_timeout_t collector_timeout; /* ms between collections.  */
 
 /* Enable statistical profiling, writing samples of the PC into at most
    SIZE bytes of SAMPLE_BUFFER; every processor clock tick while profiling
@@ -59,7 +62,12 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 
   if (! err)
     {
-      if (sample_scale == 0)
+      int tick;			/* Microseconds per sample.  */
+      err = __task_enable_pc_sampling (__mach_task_self (), &tick,
+				       SAMPLED_PC_PERIODIC);
+      if (!err && sample_scale == 0)
+	/* Profiling was not turned on, so the collector thread was
+	   suspended.  Resume it.  */
 	err = __thread_resume (profile_thread);
       if (! err)
 	{
@@ -67,6 +75,11 @@ update_waiter (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 	  maxsamples = size / sizeof *sample_buffer;
 	  pc_offset = offset;
 	  sample_scale = scale;
+	  /* Calculate a good period for the collector thread.  From TICK
+	     and the kernel buffer size we get the length of time it takes
+	     to fill the buffer; translate that to milliseconds for
+	     mach_msg, and chop it in half for general lag factor.  */
+	  collector_timeout = MAX_PC_SAMPLES * tick / 1000 / 2;
 	}
     }
 
@@ -100,17 +113,17 @@ profil (u_short *sample_buffer, size_t size, size_t offset, u_int scale)
 static void
 profile_waiter (void)
 {
-  sampled_pc_t pc_samples[512];
-  mach_msg_type_number_t nsamples = 512, i;
+  sampled_pc_t pc_samples[MAX_PC_SAMPLES];
+  mach_msg_type_number_t nsamples, i;
   mach_port_t rcv = __mach_reply_port ();
   mach_msg_header_t msg;
-  const mach_msg_timeout_t timeout = 17; /* ??? XXX */
   error_t err;
 
   while (1)
     {
       __mutex_lock (&lock);
 
+      nsamples = sizeof pc_samples / sizeof pc_samples[0];
       err = __task_get_sampled_pcs (__mach_task_self (), &seqno,
 				    pc_samples, &nsamples);
       assert_perror (err);
@@ -130,7 +143,7 @@ profile_waiter (void)
       __mutex_unlock (&lock);
 
       __mach_msg (&msg, MACH_RCV_MSG|MACH_RCV_TIMEOUT, 0, sizeof msg,
-		  rcv, timeout, MACH_PORT_NULL);
+		  rcv, collector_timeout, MACH_PORT_NULL);
     }
 }
 
diff --git a/sysdeps/posix/getcwd.c b/sysdeps/posix/getcwd.c
index 4bebece975..af858a2643 100644
--- a/sysdeps/posix/getcwd.c
+++ b/sysdeps/posix/getcwd.c
@@ -292,16 +292,15 @@ __getcwd (buf, size)
       while ((d = readdir (dirstream)) != NULL)
 	{
 	  if (d->d_name[0] == '.' &&
-	      (d->d_namlen == 1 || (d->d_namlen == 2 && d->d_name[1] == '.')))
+	      (d->d_name[1] == '\0' ||
+	       (d->d_name[1] == '.' && d->d_name[2] == '\0')))
 	    continue;
 	  if (mount_point || d->d_ino == thisino)
 	    {
-	      char *name = __alloca (dotlist + dotsize - dotp +
-				     1 + d->d_namlen + 1);
+	      char name[dotlist + dotsize - dotp + 1 + _D_ALLOC_NAMLEN (d)];
 	      memcpy (name, dotp, dotlist + dotsize - dotp);
 	      name[dotlist + dotsize - dotp] = '/';
-	      memcpy (&name[dotlist + dotsize - dotp + 1],
-		      d->d_name, d->d_namlen + 1);
+	      strcpy (&name[dotlist + dotsize - dotp + 1], d->d_name);
 	      if (__lstat (name, &st) < 0)
 		{
 		  int save = errno;
@@ -322,7 +321,9 @@ __getcwd (buf, size)
 	}
       else
 	{
-	  if (pathp - path < d->d_namlen + 1)
+	  size_t namlen = _D_EXACT_NAMLEN (d);
+
+	  if (pathp - path < namlen)
 	    {
 	      if (buf != NULL)
 		{
@@ -344,8 +345,8 @@ __getcwd (buf, size)
 		  path = buf;
 		}
 	    }
-	  pathp -= d->d_namlen;
-	  (void) memcpy (pathp, d->d_name, d->d_namlen);
+	  pathp -= namlen;
+	  (void) memcpy (pathp, d->d_name, namlen);
 	  *--pathp = '/';
 	  (void) closedir (dirstream);
 	}
diff --git a/sysdeps/posix/ttyname.c b/sysdeps/posix/ttyname.c
index 50e3c79341..b0650b38b0 100644
--- a/sysdeps/posix/ttyname.c
+++ b/sysdeps/posix/ttyname.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1992, 1993, 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
@@ -56,17 +56,18 @@ DEFUN(ttyname, (fd), int fd)
   while ((d = readdir (dirstream)) != NULL)
     if (d->d_fileno == myino)
       {
-	if (sizeof (dev) + d->d_namlen + 1 > namelen)
+	size_t dlen = _D_ALLOC_NAMLEN (d);
+	if (sizeof (dev) + dlen > namelen)
 	  {
 	    free (name);
-	    namelen = 2 * (sizeof (dev) + d->d_namlen + 1); /* Big enough.  */
+	    namelen = 2 * (sizeof (dev) + dlen); /* Big enough.  */
 	    name = malloc (namelen);
 	    if (! name)
 	      return NULL;
 	    (void) memcpy (name, dev, sizeof (dev) - 1);
 	    name[sizeof (dev) - 1] = '/';
 	  }
-	(void) memcpy (&name[sizeof (dev)], d->d_name, d->d_namlen + 1);
+	(void) memcpy (&name[sizeof (dev)], d->d_name, dlen);
 	if (stat (name, &st) == 0 && st.st_dev == mydev)
 	  {
 	    (void) closedir (dirstream);
diff --git a/sysdeps/stub/direntry.h b/sysdeps/stub/direntry.h
new file mode 100644
index 0000000000..0bf53169b0
--- /dev/null
+++ b/sysdeps/stub/direntry.h
@@ -0,0 +1,23 @@
+/* Directory entry structure `struct dirent'.  Stub version.
+Copyright (C) 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.  */
+
+struct dirent
+  {
+    char d_name[1];		/* Variable length.  */
+  }
diff --git a/sysdeps/unix/bsd/bsd4.4/direntry.h b/sysdeps/unix/bsd/bsd4.4/direntry.h
new file mode 100644
index 0000000000..c221d55c0d
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/direntry.h
@@ -0,0 +1,33 @@
+/* Directory entry structure `struct dirent'.  4.4BSD version.
+Copyright (C) 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.  */
+
+struct dirent
+  {
+    __ino_t d_fileno;		/* File serial number.  */
+    unsigned short int d_reclen; /* Length of the whole `struct dirent'.  */
+    unsigned char d_type;	/* File type, possibly unknown.  */
+    unsigned char d_namlen;	/* Length of the file name.  */
+
+    /* Only this member is in the POSIX standard.  */
+    char d_name[1];		/* File name (actually longer).  */
+  };
+
+#define _DIRENT_HAVE_D_RECLEN 1
+#define _DIRENT_HAVE_D_NAMLEN 1
+#define _DIRENT_HAVE_D_TYPE 1
diff --git a/sysdeps/unix/bsd/direntry.h b/sysdeps/unix/bsd/direntry.h
new file mode 100644
index 0000000000..eb55d57af7
--- /dev/null
+++ b/sysdeps/unix/bsd/direntry.h
@@ -0,0 +1,29 @@
+/* Directory entry structure `struct dirent'.  4.2BSD version.
+Copyright (C) 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.  */
+
+struct dirent
+  {
+    unsigned int d_fileno;	/* 32 bits.  */
+    unsigned short int d_reclen; /* 16 bits.  */
+    unsigned short int d_namlen; /* 16 bits.  */
+    char d_name[0];		/* Variable length.  */
+  };
+
+#define _DIRENT_HAVE_D_RECLEN 1
+#define _DIRENT_HAVE_D_NAMLEN 1
diff --git a/sysdeps/unix/closedir.c b/sysdeps/unix/closedir.c
index 5f1ac7439a..791eaad250 100644
--- a/sysdeps/unix/closedir.c
+++ b/sysdeps/unix/closedir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1993, 1995, 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
@@ -22,7 +22,7 @@ Cambridge, MA 02139, USA.  */
 #include <stdlib.h>
 #include <dirent.h>
 #include <unistd.h>
-#include "dirstream.h"
+#include <dirstream.h>
 
 /* Close the directory stream DIRP.
    Return 0 if successful, -1 if not.  */
@@ -37,9 +37,9 @@ DEFUN(closedir, (dirp), DIR *dirp)
       return -1;
     }
 
-  fd = dirp->__fd;
+  fd = dirp->fd;
 
-  free ((PTR) dirp->__data);
+  free ((PTR) dirp->data);
   free ((PTR) dirp);
 
   return __close (fd);
diff --git a/sysdeps/unix/common/direntry.h b/sysdeps/unix/common/direntry.h
new file mode 100644
index 0000000000..5decd56db6
--- /dev/null
+++ b/sysdeps/unix/common/direntry.h
@@ -0,0 +1,29 @@
+/* Directory entry structure `struct dirent'.  SVR4/Linux version.
+Copyright (C) 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.  */
+
+struct dirent
+  {
+    unsigned int d_fileno;
+    int d_off;			/* Position in directory of following entry. */
+    unsigned short int d_reclen;
+    char d_name[0];		/* Variable length.  */
+  };
+
+#define _DIRENT_HAVE_D_RECLEN 1
+#define _DIRENT_HAVE_D_OFF 1
diff --git a/sysdeps/unix/dirfd.c b/sysdeps/unix/dirfd.c
index 7733634a47..d02c12a1fd 100644
--- a/sysdeps/unix/dirfd.c
+++ b/sysdeps/unix/dirfd.c
@@ -26,5 +26,5 @@ int
 dirfd (dirp)
      DIR *dirp;
 {
-  return dirp->__fd;
+  return dirp->fd;
 }
diff --git a/sysdeps/unix/dirstream.h b/sysdeps/unix/dirstream.h
index 72fd67c722..87e78b61ad 100644
--- a/sysdeps/unix/dirstream.h
+++ b/sysdeps/unix/dirstream.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1993, 1995, 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
@@ -20,26 +20,25 @@ Cambridge, MA 02139, USA.  */
 
 #define	_DIRSTREAM_H	1
 
-#define __need_size_t
-#include <stddef.h>
+#include <sys/types.h>
 
 /* Directory stream type.
 
    The miscellaneous Unix `readdir' implementations read directory data
-   into a buffer and fill in a `struct dirent' copy in the `DIR' object. */
+   into a buffer and return `struct dirent *' pointers into it.  */
 
 struct __dirstream
   {
-    int __fd;			/* File descriptor.  */
+    int fd;			/* File descriptor.  */
 
-    char *__data;		/* Directory block.  */
-    size_t __allocation;	/* Space allocated for the block.  */
-    size_t __offset;		/* Current offset into the block.  */
-    size_t __size;		/* Total valid data in the block.  */
+    char *data;			/* Directory block.  */
+    size_t allocation;		/* Space allocated for the block.  */
+    size_t size;		/* Total valid data in the block.  */
+    size_t offset;		/* Current offset into the block.  */
 
-    struct dirent __entry;	/* Returned by `readdir'.  */
+    off_t filepos;		/* Position of next entry to read.  */
   };
 
-#define _DIR_dirfd(dirp)	((dirp)->__fd)
+#define _DIR_dirfd(dirp)	((dirp)->fd)
 
 #endif	/* dirstream.h */
diff --git a/sysdeps/unix/opendir.c b/sysdeps/unix/opendir.c
index 5cd620676a..df20b9c131 100644
--- a/sysdeps/unix/opendir.c
+++ b/sysdeps/unix/opendir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 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
@@ -16,7 +16,6 @@ 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 <ansidecl.h>
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>
@@ -28,12 +27,11 @@ Cambridge, MA 02139, USA.  */
 #include <unistd.h>
 #include <stdio.h>
 
-#include "direct.h"		/* This file defines `struct direct'.  */
-#include "dirstream.h"
+#include <dirstream.h>
 
 /* Open a directory stream on NAME.  */
 DIR *
-DEFUN(opendir, (name), CONST char *name)
+opendir (const char *name)
 {
   DIR *dirp;
   struct stat statbuf;
@@ -62,7 +60,7 @@ DEFUN(opendir, (name), CONST char *name)
       goto lose;
     }
 
-  dirp = (DIR *) calloc (1, sizeof (DIR) + NAME_MAX); /* Zero-fill.  */
+  dirp = (DIR *) calloc (1, sizeof (DIR)); /* Zero-fill.  */
   if (dirp == NULL)
   lose:
     {
@@ -73,24 +71,24 @@ DEFUN(opendir, (name), CONST char *name)
     }
 
 #ifdef _STATBUF_ST_BLKSIZE
-  if (statbuf.st_blksize < sizeof (struct direct))
-    dirp->__allocation = sizeof (struct direct);
+  if (statbuf.st_blksize < sizeof (struct dirent))
+    dirp->allocation = sizeof (struct dirent);
   else
-    dirp->__allocation = statbuf.st_blksize;
+    dirp->allocation = statbuf.st_blksize;
 #else
-  dirp->__allocation = (BUFSIZ < sizeof (struct direct) ?
-			sizeof (struct direct) : BUFSIZ);
+  dirp->allocation = (BUFSIZ < sizeof (struct dirent) ?
+		      sizeof (struct dirent) : BUFSIZ);
 #endif
-  dirp->__data = (char *) malloc (dirp->__allocation);
-  if (dirp->__data == NULL)
+  dirp->data = (char *) malloc (dirp->allocation);
+  if (dirp->data == NULL)
     {
       int save = errno;
-      free ((PTR) dirp);
+      free (dirp);
       (void) __close (fd);
       errno = save;
       return NULL;
     }
 
-  dirp->__fd = fd;
+  dirp->fd = fd;
   return dirp;
 }
diff --git a/sysdeps/unix/readdir.c b/sysdeps/unix/readdir.c
index 1842948a35..84ac033e09 100644
--- a/sysdeps/unix/readdir.c
+++ b/sysdeps/unix/readdir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 92, 93, 94, 95, 96 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
@@ -16,7 +16,6 @@ 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 <ansidecl.h>
 #include <errno.h>
 #include <limits.h>
 #include <stddef.h>
@@ -24,60 +23,77 @@ Cambridge, MA 02139, USA.  */
 #include <dirent.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <assert.h>
 
-#include "direct.h"		/* This file defines `struct direct'.  */
-#include "dirstream.h"
-
-/* direct.h may have an alternate definition for this.  */
-#ifndef D_RECLEN
-#define D_RECLEN(dp)	((dp)->d_reclen)
-#endif
+#include <dirstream.h>
 
 
 /* Read a directory entry from DIRP.  */
 struct dirent *
-DEFUN(readdir, (dirp), DIR *dirp)
+readdir (DIR *dirp)
 {
-  if (dirp == NULL || dirp->__data == NULL)
+  struct dirent *dp;
+
+  if (dirp == NULL || dirp->data == NULL)
     {
       errno = EINVAL;
       return NULL;
     }
 
-  while (1)
+  do
     {
-      struct direct *dp;
+      size_t reclen;
 
-      if (dirp->__offset >= dirp->__size)
+      if (dirp->offset >= dirp->size)
 	{
 	  /* We've emptied out our buffer.  Refill it.  */
 
+	  size_t maxread;
 	  off_t base;
-	  ssize_t bytes = __getdirentries (dirp->__fd, dirp->__data,
-					   dirp->__allocation, &base);
+	  ssize_t bytes;
+
+	  if (sizeof (dp->d_name) > 1)
+	    /* Fixed-size struct; must read one at a time (see below).  */
+	    maxread = sizeof *dp;
+	  else
+	    maxread = dirp->allocation;
+
+	  base = dirp->filepos;
+	  bytes = __getdirentries (dirp->fd, dirp->data, maxread, &base);
 	  if (bytes <= 0)
 	    return NULL;
-	  dirp->__size = (size_t) bytes;
+	  dirp->size = (size_t) bytes;
 
 	  /* Reset the offset into the buffer.  */
-	  dirp->__offset = 0;
+	  dirp->offset = 0;
 	}
 
-      dp = (struct direct *) &dirp->__data[dirp->__offset];
-      dirp->__offset += D_RECLEN (dp);
+      dp = (struct dirent *) &dirp->data[dirp->offset];
 
-      if (dp->d_ino != 0)
-	{
-	  /* Not a deleted file.  */
-	  register struct dirent *d = &dirp->__entry;
-	  register const char *p;
-	  d->d_fileno = (ino_t) dp->d_ino;
-	  /* On some systems the name length does not actually mean much.
-	     But we always use it as a maximum.  */
-	  p = memchr ((PTR) dp->d_name, '\0', D_NAMLEN (dp) + 1);
-	  d->d_namlen = (p != NULL) ? p - dp->d_name : D_NAMLEN (dp);
-	  memcpy (d->d_name, dp->d_name, d->d_namlen + 1);
-	  return d;
-	}
-    }
+#ifdef _DIRENT_HAVE_D_RECLEN
+      reclen = dp->d_reclen;
+#else
+      /* The only version of `struct dirent' that lacks `d_reclen'
+	 is fixed-size.  */
+      assert (sizeof dp->d_name > 1);
+      reclen = sizeof *dp;
+      /* The name is not terminated if it is the largest possible size.
+	 Clobber the following byte to ensure proper null termination.  We
+	 read jst one entry at a time above so we know that byte will not
+	 be used later.  */
+      dp->d_name[sizeof dp->d_name] = '\0';
+#endif
+
+      dirp->offset += reclen;
+
+#ifdef _DIRENT_HAVE_D_OFF
+      dirp->filepos = dp->d_off;
+#else
+      dirp->filepos += reclen;
+#endif
+
+      /* Skip deleted files.  */
+    } while (dp->d_ino == 0);
+
+  return dp;
 }
diff --git a/sysdeps/unix/rewinddir.c b/sysdeps/unix/rewinddir.c
index 7ad7bc11a3..791ecc1a4b 100644
--- a/sysdeps/unix/rewinddir.c
+++ b/sysdeps/unix/rewinddir.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991, 1995 Free Software Foundation, Inc.
+/* Copyright (C) 1991, 1995, 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
@@ -21,13 +21,13 @@ Cambridge, MA 02139, USA.  */
 #include <dirent.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include "dirstream.h"
+#include <dirstream.h>
 
 /* Rewind DIRP to the beginning of the directory.  */
 void
 DEFUN(rewinddir, (dirp), DIR *dirp)
 {
-  (void) lseek(dirp->__fd, (off_t) 0, SEEK_SET);
-  dirp->__offset = 0;
-  dirp->__size = 0;
+  (void) lseek(dirp->fd, (off_t) 0, SEEK_SET);
+  dirp->offset = 0;
+  dirp->size = 0;
 }
diff --git a/sysdeps/unix/seekdir.c b/sysdeps/unix/seekdir.c
index 018f697c21..9ce332b400 100644
--- a/sysdeps/unix/seekdir.c
+++ b/sysdeps/unix/seekdir.c
@@ -21,13 +21,13 @@ Cambridge, MA 02139, USA.  */
 #include <stddef.h>
 #include <dirent.h>
 #include <unistd.h>
-#include "dirstream.h"
+#include <dirstream.h>
 
 /* Seek to position POS in DIRP.  */
 void
 DEFUN(seekdir, (dirp, pos), DIR *dirp AND __off_t pos)
 {
-  (void) __lseek(dirp->__fd, pos, SEEK_SET);
-  dirp->__size = 0;
-  dirp->__offset = 0;
+  (void) __lseek(dirp->fd, pos, SEEK_SET);
+  dirp->size = 0;
+  dirp->offset = 0;
 }
diff --git a/sysdeps/unix/sysv/direntry.h b/sysdeps/unix/sysv/direntry.h
new file mode 100644
index 0000000000..5035f143ce
--- /dev/null
+++ b/sysdeps/unix/sysv/direntry.h
@@ -0,0 +1,24 @@
+/* Directory entry structure `struct dirent'.  Old System V version.
+Copyright (C) 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.  */
+
+struct dirent
+  {
+    unsigned short int d_fileno;
+    char d_name[14];
+  };
diff --git a/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list b/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list
new file mode 100644
index 0000000000..52063630dc
--- /dev/null
+++ b/sysdeps/unix/sysv/sysv4/solaris2/syscalls.list
@@ -0,0 +1,3 @@
+# File name	Caller	Syscall name	# args	Strong name	Weak names
+
+sigaction	-	sigaction	3	__sigaction	sigaction
diff --git a/sysdeps/unix/telldir.c b/sysdeps/unix/telldir.c
index 2b611b0fca..d9b8d11a05 100644
--- a/sysdeps/unix/telldir.c
+++ b/sysdeps/unix/telldir.c
@@ -16,28 +16,13 @@ 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 <ansidecl.h>
-#include <errno.h>
-#include <stddef.h>
 #include <dirent.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include "dirstream.h"
+
+#include <dirstream.h>
 
 /* Return the current position of DIRP.  */
 off_t
-DEFUN(telldir, (dirp), DIR *dirp)
+telldir (DIR *dirp)
 {
-  register off_t pos;
-
-  if (dirp == NULL)
-    {
-      errno = EINVAL;
-      return (off_t) -1;
-    }
-
-  pos = __lseek(dirp->__fd, (off_t) 0, SEEK_CUR);
-  if (pos == (off_t) -1)
-    return (off_t) -1;
-  return pos + dirp->__size - dirp->__offset;
+  return dirp->filepos;
 }