mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08:00
980e58323a
* 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.
101 lines
2.6 KiB
C
101 lines
2.6 KiB
C
/* Copyright (C) 1991,92,93,94,95,96,97,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
|
|
modify it under the terms of the GNU Library General Public License as
|
|
published by the Free Software Foundation; either version 2 of the
|
|
License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
#include <dirent.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <assert.h>
|
|
|
|
#include <dirstream.h>
|
|
|
|
|
|
/* Read a directory entry from DIRP. */
|
|
struct dirent *
|
|
__readdir (DIR *dirp)
|
|
{
|
|
struct dirent *dp;
|
|
|
|
__libc_lock_lock (dirp->lock);
|
|
|
|
do
|
|
{
|
|
size_t reclen;
|
|
|
|
if (dirp->offset >= dirp->size)
|
|
{
|
|
/* We've emptied out our buffer. Refill it. */
|
|
|
|
size_t maxread;
|
|
ssize_t bytes;
|
|
|
|
#ifndef _DIRENT_HAVE_D_RECLEN
|
|
/* Fixed-size struct; must read one at a time (see below). */
|
|
maxread = sizeof *dp;
|
|
#else
|
|
maxread = dirp->allocation;
|
|
#endif
|
|
|
|
bytes = __getdents (dirp->fd, dirp->data, maxread);
|
|
if (bytes <= 0)
|
|
{
|
|
dp = NULL;
|
|
break;
|
|
}
|
|
dirp->size = (size_t) bytes;
|
|
|
|
/* Reset the offset into the buffer. */
|
|
dirp->offset = 0;
|
|
}
|
|
|
|
dp = (struct dirent *) &dirp->data[dirp->offset];
|
|
|
|
#ifdef _DIRENT_HAVE_D_RECLEN
|
|
reclen = dp->d_reclen;
|
|
#else
|
|
/* The only version of `struct dirent' that lacks `d_reclen'
|
|
is fixed-size. */
|
|
assert (sizeof dp->d_name > 1);
|
|
reclen = sizeof *dp;
|
|
/* The name is not terminated if it is the largest possible size.
|
|
Clobber the following byte to ensure proper null termination. We
|
|
read jst one entry at a time above so we know that byte will not
|
|
be used later. */
|
|
dp->d_name[sizeof dp->d_name] = '\0';
|
|
#endif
|
|
|
|
dirp->offset += reclen;
|
|
|
|
#ifdef _DIRENT_HAVE_D_OFF
|
|
dirp->filepos = dp->d_off;
|
|
#else
|
|
dirp->filepos += reclen;
|
|
#endif
|
|
|
|
/* Skip deleted files. */
|
|
} while (dp->d_ino == 0);
|
|
|
|
__libc_lock_unlock (dirp->lock);
|
|
|
|
return dp;
|
|
}
|
|
weak_alias (__readdir, readdir)
|