about summary refs log tree commit diff
path: root/sysdeps/unix/readdir.c
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1996-02-27 00:55:03 +0000
committerRoland McGrath <roland@gnu.org>1996-02-27 00:55:03 +0000
commit92777700d297c23825e785e6f6a0161bd398705d (patch)
tree18a993370c7cac36c18f22726cab004f54899122 /sysdeps/unix/readdir.c
parenta182affdd948423d4779f848954e411c94f41a54 (diff)
downloadglibc-92777700d297c23825e785e6f6a0161bd398705d.tar.gz
glibc-92777700d297c23825e785e6f6a0161bd398705d.tar.xz
glibc-92777700d297c23825e785e6f6a0161bd398705d.zip
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.
Diffstat (limited to 'sysdeps/unix/readdir.c')
-rw-r--r--sysdeps/unix/readdir.c84
1 files changed, 50 insertions, 34 deletions
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;
 }