mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-03 20:53:13 +03:00
857fa1b81d
* malloc/malloc.c (morecore): Don't attempt recursive realloc of info table when _heaplimit==0 during realloc growing large block. * MakeTAGS (extract): Remove /dev/null from xgettext command line. (text-srcs): New variable: extract only C sources from $(tags_sources). (po/$(domain).pot): Depend on that. If it's empty, cp /dev/null $@ instead of $(extract). * misc/Makefile (headers): Add iovec.h. * sysdeps/unix/sysv/linux/iovec.h: New file. * sysdeps/generic/iovec.h: New file. * misc/sys/uio.h (struct iovec): Type replaced with #include <iovec.h>. * configure.in (NO_UNDERSCORES check): Use AC_TRY_LINK instead of AC_TRY_COMPILE. * misc/sys/cdefs.h [__USE_BSD] (const, signed, volatile): Move these macros inside [! __STDC__]. * stdlib/rpmatch.c: New file. * stdlib/Makefile (routines): Add rpmatch. * stdlib/stdlib.h [__USE_SVID]: Declare rpmatch. * MakeTAGS (MSGJOIN): Variable removed. (po/SYS_libc.pot): Use $(XGETTEXT) instead of $(MSGJOIN). Wed Mar 20 20:08:46 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/unix/sysdep.h: Don't define C_SYMBOL_NAME. * sysdeps/unix/sysv/linux/m68k/sysdep.h: Don't define NO_UNDERSCORES.
101 lines
2.5 KiB
C
101 lines
2.5 KiB
C
/* Copyright (C) 1991, 92, 93, 94, 95, 96 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., 675 Mass Ave,
|
|
Cambridge, MA 02139, 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;
|
|
|
|
if (dirp == NULL || dirp->data == NULL)
|
|
{
|
|
errno = EINVAL;
|
|
return NULL;
|
|
}
|
|
|
|
do
|
|
{
|
|
size_t reclen;
|
|
|
|
if (dirp->offset >= dirp->size)
|
|
{
|
|
/* We've emptied out our buffer. Refill it. */
|
|
|
|
size_t maxread;
|
|
off_t base;
|
|
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
|
|
|
|
base = dirp->filepos;
|
|
bytes = __getdirentries (dirp->fd, dirp->data, maxread, &base);
|
|
if (bytes <= 0)
|
|
return NULL;
|
|
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);
|
|
|
|
return dp;
|
|
}
|