summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2014-09-08 14:45:58 +0000
committerjhb <jhb@FreeBSD.org>2014-09-08 14:45:58 +0000
commitf227573925902e9f3ed1e3c641089576308e382e (patch)
treeb0f09d1a859f89855b21565bc7414c15e54f2e36 /lib
parent1b9496716d6c8b542db3304a742378cddb1b7c48 (diff)
downloadFreeBSD-src-f227573925902e9f3ed1e3c641089576308e382e.zip
FreeBSD-src-f227573925902e9f3ed1e3c641089576308e382e.tar.gz
MFC 271048:
Always seek back to the beginning of a regular directory, even if the previous seek location was 0. Without this, readdir() would see dd_loc of zero and call getdirentries() which would start reading entries at the current seek location of the directory ignoring the first batch of entries. Also, rewinddir() should always seek so that it reads the directory from the beginning to get updated entries. PR: 192935 Approved by: re (gjb)
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/gen/rewinddir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/libc/gen/rewinddir.c b/lib/libc/gen/rewinddir.c
index 89e717c..193f4b0 100644
--- a/lib/libc/gen/rewinddir.c
+++ b/lib/libc/gen/rewinddir.c
@@ -53,7 +53,7 @@ rewinddir(dirp)
_pthread_mutex_lock(&dirp->dd_lock);
if (dirp->dd_flags & __DTF_READALL)
_filldir(dirp, false);
- else if (dirp->dd_seek != 0) {
+ else {
(void) lseek(dirp->dd_fd, 0, SEEK_SET);
dirp->dd_seek = 0;
}
OpenPOWER on IntegriCloud