diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2007-02-08 18:47:33 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2007-02-08 18:47:33 +0000 |
| commit | 80ab6fb5c69fe4980292f75b60af96901b22d6f8 (patch) | |
| tree | 8f255ff00ace7e6ba10864b4137aa5418bde3abd /libexec/ld.so/dir.c | |
| parent | ada7dd7d714f842345d1ddbf90b1df5abe592dbb (diff) | |
Remove __DTF_READALL usage in ld.so's private copy of readdir().
Diffstat (limited to 'libexec/ld.so/dir.c')
| -rw-r--r-- | libexec/ld.so/dir.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libexec/ld.so/dir.c b/libexec/ld.so/dir.c index 72c1bf84f94..40747894ef0 100644 --- a/libexec/ld.so/dir.c +++ b/libexec/ld.so/dir.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.11 2006/03/24 20:00:35 otto Exp $ */ +/* $OpenBSD: dir.c,v 1.12 2007/02/08 18:47:32 millert Exp $ */ /* * Copyright (c) 1983, 1993 * The Regents of the University of California. All rights reserved. @@ -135,11 +135,9 @@ _dl_readdir(DIR *dirp) for (;;) { if (dirp->dd_loc >= dirp->dd_size) { - if (dirp->dd_flags & __DTF_READALL) - return (NULL); dirp->dd_loc = 0; } - if (dirp->dd_loc == 0 && !(dirp->dd_flags & __DTF_READALL)) { + if (dirp->dd_loc == 0) { dirp->dd_size = _dl_getdirentries(dirp->dd_fd, dirp->dd_buf, dirp->dd_len, &dirp->dd_seek); if (dirp->dd_size <= 0) |