summaryrefslogtreecommitdiff
path: root/libc/misc/dirent/readdir64_r.c
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2003-01-28 11:06:03 +0000
committerEric Andersen <andersen@codepoet.org>2003-01-28 11:06:03 +0000
commit1e78eb0bd44caf57a234c49ff9b5193a977b6ad3 (patch)
tree5f48d2c9aeedfe8c04d989230427204f10f7e0ba /libc/misc/dirent/readdir64_r.c
parent46de710e624b2e578d9adf3bf44de5513867fba3 (diff)
Fix scandir64 to not free the wrong pieces of memory (which could
and did cause segfaults) by adjusting the working scandir.c to the the 64 thing. Fix up potential for mismatches between the libc and kernel dirent structures, which could also cause ugly problems. -Erik
Diffstat (limited to 'libc/misc/dirent/readdir64_r.c')
-rw-r--r--libc/misc/dirent/readdir64_r.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libc/misc/dirent/readdir64_r.c b/libc/misc/dirent/readdir64_r.c
index f4aeb7869..6b22261db 100644
--- a/libc/misc/dirent/readdir64_r.c
+++ b/libc/misc/dirent/readdir64_r.c
@@ -19,8 +19,6 @@
#include <dirent.h>
#include "dirstream.h"
-extern int getdents64 __P ((unsigned int fd, struct dirent64 *dirp, unsigned int count));
-
int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
{
@@ -41,7 +39,7 @@ int readdir64_r(DIR *dir, struct dirent64 *entry, struct dirent64 **result)
do {
if (dir->dd_size <= dir->dd_nextloc) {
/* read dir->dd_max bytes of directory entries. */
- bytes = getdents64(dir->dd_fd, dir->dd_buf, dir->dd_max);
+ bytes = __getdents64(dir->dd_fd, dir->dd_buf, dir->dd_max);
if (bytes <= 0) {
*result = NULL;
ret = errno;