diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-04-27 13:06:39 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-04-27 13:06:39 +0000 |
| commit | 980e58323af243dd0a87f6a6eeec6f97308b46e5 (patch) | |
| tree | 553907bc56fa9387a688da4efb5e9d710abefb22 /sysdeps/unix/readdir_r.c | |
| parent | b6a7609d56147398e6fa412fd7c7210960300505 (diff) | |
Update.
* include/dirent.h: Remove __getdirentries declaration, add __getdents
and __getdents64.
* sysdeps/unix/readdir.c: Use __getdents, not __getdirentries.
* sysdeps/unix/readdir_r.c: Likewise.
* sysdeps/unix/sysv/linux/readdir64.c: Likewise.
* sysdeps/unix/sysv/linux/readdir64_r.c: Likewise.
* sysdeps/unix/sysv/linux/getdents.c: Define __getdents, not
__getdirentries. Remove fourth argument.
* sysdeps/unix/sysv/linux/getdirentries.c: New file.
* sysdeps/unix/sysv/linux/getdirentries64.c: New file.
* sysdeps/unix/sysv/linux/Makefile [subdir=dirent] (sysdep_routines):
Add getdirentries and getdirentries64.
* sysdeps/unix/sysv/linux/Dist: Add getdirentries and getdirentries64.
Diffstat (limited to 'sysdeps/unix/readdir_r.c')
| -rw-r--r-- | sysdeps/unix/readdir_r.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sysdeps/unix/readdir_r.c b/sysdeps/unix/readdir_r.c index 15a4c3775c..8d5cfdca16 100644 --- a/sysdeps/unix/readdir_r.c +++ b/sysdeps/unix/readdir_r.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991,92,93,94,95,96,97,98 Free Software Foundation, Inc. +/* Copyright (C) 1991,92,93,94,95,96,97,98,99 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 @@ -44,7 +44,6 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) /* We've emptied out our buffer. Refill it. */ size_t maxread; - off_t base; ssize_t bytes; #ifndef _DIRENT_HAVE_D_RECLEN @@ -54,8 +53,7 @@ __readdir_r (DIR *dirp, struct dirent *entry, struct dirent **result) maxread = dirp->allocation; #endif - base = dirp->filepos; - bytes = __getdirentries (dirp->fd, dirp->data, maxread, &base); + bytes = __getdents (dirp->fd, dirp->data, maxread); if (bytes <= 0) { dp = NULL; |