--- Libc/Libc-1725.40.4/gen/FreeBSD/readdir.c
+++ Libc/Libc-498/gen/FreeBSD/readdir.c
@@ -10,6 +10,10 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -31,87 +35,39 @@
 static char sccsid[] = "@(#)readdir.c	8.3 (Berkeley) 9/29/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/lib/libc/gen/readdir.c,v 1.11 2002/02/26 21:39:32 alfred Exp $");
 
 #include "namespace.h"
 #include <sys/param.h>
 #include <dirent.h>
 #include <errno.h>
-#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <pthread.h>
 #include "un-namespace.h"
 
 #include "libc_private.h"
-#include "telldir.h"
 
 /*
  * get next entry in a directory.
  */
 struct dirent *
-_readdir_unlocked(DIR *dirp, int skip)
+_readdir_unlocked(dirp)
+	DIR *dirp;
 {
 	struct dirent *dp;
-	long initial_seek;
-	long initial_loc = 0;
 
 	for (;;) {
 		if (dirp->dd_loc >= dirp->dd_size) {
-			if (dirp->dd_flags & (__DTF_READALL | __DTF_ATEND))
+			if (dirp->dd_flags & __DTF_READALL)
 				return (NULL);
-			initial_loc = dirp->dd_loc;
-			dirp->dd_flags &= ~__DTF_SKIPREAD;
 			dirp->dd_loc = 0;
 		}
-		if (dirp->dd_loc == 0 &&
-		    !(dirp->dd_flags & (__DTF_READALL | __DTF_ATEND | __DTF_SKIPREAD))) {
-			if (dirp->dd_len == READDIR_INITIAL_SIZE) {
-				/*
-				 * If we need to read more, and we still have the original size,
-				 * then grow the internal buffer to a large size to amortize
-				 * the cost of __getdirentries64 calls.
-				 */
-				int len = READDIR_LARGE_SIZE;
-				char *buf = malloc(len);
-				if (buf) {
-					free(dirp->dd_buf);
-					dirp->dd_buf = buf;
-					dirp->dd_len = len;
-				}
-			}
-#if __DARWIN_64_BIT_INO_T
-			/*
-			 * sufficiently recent kernels when the buffer is large enough,
-			 * will use the last bytes of the buffer to return status.
-			 *
-			 * To support older kernels:
-			 * - make sure it's 0 initialized
-			 * - make sure it's past `dd_size` before reading it
-			 */
-			getdirentries64_flags_t *gdeflags =
-			    (getdirentries64_flags_t *)(dirp->dd_buf + dirp->dd_len -
-			    sizeof(getdirentries64_flags_t));
-			*gdeflags = 0;
-			initial_seek = dirp->dd_td->seekoff;
-			dirp->dd_size = (long)__getdirentries64(dirp->dd_fd,
-			    dirp->dd_buf, dirp->dd_len, &dirp->dd_td->seekoff);
-			if (dirp->dd_size >= 0 &&
-			    dirp->dd_size <= dirp->dd_len - sizeof(getdirentries64_flags_t)) {
-				if (*gdeflags & GETDIRENTRIES64_EOF) {
-					dirp->dd_flags |= __DTF_ATEND;
-				}
-			}
-#else /* !__DARWIN_64_BIT_INO_T */
-			initial_seek = dirp->dd_seek;
+		if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) {
 			dirp->dd_size = _getdirentries(dirp->dd_fd,
 			    dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
-#endif /* __DARWIN_64_BIT_INO_T */
 			if (dirp->dd_size <= 0)
 				return (NULL);
-			_fixtelldir(dirp, initial_seek, initial_loc);
 		}
-		dirp->dd_flags &= ~__DTF_SKIPREAD;
 		dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
 		if ((long)dp & 03L)	/* bogus pointer check */
 			return (NULL);
@@ -119,7 +75,7 @@
 		    dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
 			return (NULL);
 		dirp->dd_loc += dp->d_reclen;
-		if (dp->d_ino == 0 && skip)
+		if (dp->d_ino == 0)
 			continue;
 		if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
 			continue;
@@ -128,22 +84,26 @@
 }
 
 struct dirent *
-readdir(DIR *dirp)
+readdir(dirp)
+	DIR *dirp;
 {
 	struct dirent	*dp;
 
 	if (__isthreaded) {
-		_pthread_mutex_lock(&dirp->dd_lock);
-		dp = _readdir_unlocked(dirp, 1);
-		_pthread_mutex_unlock(&dirp->dd_lock);
+		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		dp = _readdir_unlocked(dirp);
+		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
 	}
 	else
-		dp = _readdir_unlocked(dirp, 1);
+		dp = _readdir_unlocked(dirp);
 	return (dp);
 }
 
 int
-readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result)
+readdir_r(dirp, entry, result)
+	DIR *dirp;
+	struct dirent *entry;
+	struct dirent **result;
 {
 	struct dirent *dp;
 	int saved_errno;
@@ -151,12 +111,12 @@
 	saved_errno = errno;
 	errno = 0;
 	if (__isthreaded) {
-		_pthread_mutex_lock(&dirp->dd_lock);
-		if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
+		_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
+		if ((dp = _readdir_unlocked(dirp)) != NULL)
 			memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
-		_pthread_mutex_unlock(&dirp->dd_lock);
+		_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
 	}
-	else if ((dp = _readdir_unlocked(dirp, 1)) != NULL)
+	else if ((dp = _readdir_unlocked(dirp)) != NULL)
 		memcpy(entry, dp, _GENERIC_DIRSIZ(dp));
 
 	if (errno != 0) {