mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
be10a86854
Mon Feb 19 15:30:26 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * stdio-common/tstscanf.c (main): Add check for "0" as %d. * sysdeps/stub/msync.c: Undo change of Jan 29; just two args. Only some systems have three args; let them define their own stub. * sysdeps/generic/dl-sysdep.c: Declare _dl_secure. * sysdeps/generic/machine-gmon.h: New file. * gmon/Makefile (distribute): Add machine-gmon.h. * gmon/mcount.c: Undo changes of Feb 13. Include "machine-gmon.h". Sun Feb 18 13:24:06 1996 Roland McGrath <roland@charlie-brown.gnu.ai.mit.edu> * sysdeps/unix/sysv/linux/direct.h: File removed, since it is identical to unix/common/direct.h. * sysdeps/unix/Makefile [no_deps]: Don't include s-proto.d. * sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Don't add ipc. * stdio-common/Makefile (tests): Remove scanf6. * sysdeps/unix/sysv/linux/Makefile (non-lib.a): Append libieee.a. * time/mktime.c (mktime): Move static variable localtime_offset to file scope. * stdio-common/vfscanf.c: Put '0' in buffer before scanning for %i base indicator. Thu Feb 15 16:56:17 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * sysdeps/m68k/dl-machine.h (elf_machine_load_address): Corrected. (ELF_MACHINE_BEFORE_RTLD_RELOC): Define. (_dl_runtime_resolve): Save %a1 as well. (ELF_MACHINE_RUNTIME_FIXUP_ARGS): Add second dummy arg. (elf_machine_relplt): Define. * elf/dl-runtime.c: Include possible extra args in declaration of fixup.
86 lines
2.4 KiB
C
86 lines
2.4 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 <ansidecl.h>
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <stddef.h>
|
|
#include <string.h>
|
|
#include <dirent.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
|
|
#include "direct.h" /* This file defines `struct direct'. */
|
|
#include "dirstream.h"
|
|
|
|
/* direct.h may have an alternate definition for this. */
|
|
#ifndef D_RECLEN
|
|
#define D_RECLEN(dp) ((dp)->d_reclen)
|
|
#endif
|
|
|
|
|
|
/* Read a directory entry from DIRP. */
|
|
struct dirent *
|
|
DEFUN(readdir, (dirp), DIR *dirp)
|
|
{
|
|
if (dirp == NULL || dirp->__data == NULL)
|
|
{
|
|
errno = EINVAL;
|
|
return NULL;
|
|
}
|
|
|
|
while (1)
|
|
{
|
|
struct direct *dp;
|
|
|
|
if (dirp->__offset >= dirp->__size)
|
|
{
|
|
/* We've emptied out our buffer. Refill it. */
|
|
|
|
off_t base;
|
|
ssize_t bytes = __getdirentries (dirp->__fd, dirp->__data,
|
|
dirp->__allocation, &base);
|
|
if (bytes <= 0)
|
|
return NULL;
|
|
dirp->__size = (size_t) bytes;
|
|
|
|
/* Reset the offset into the buffer. */
|
|
dirp->__offset = 0;
|
|
}
|
|
|
|
dp = (struct direct *) &dirp->__data[dirp->__offset];
|
|
dirp->__offset += D_RECLEN (dp);
|
|
|
|
if (dp->d_ino != 0)
|
|
{
|
|
/* Not a deleted file. */
|
|
register struct dirent *d = &dirp->__entry;
|
|
register const char *p;
|
|
d->d_fileno = (ino_t) dp->d_ino;
|
|
/* On some systems the name length does not actually mean much.
|
|
But we always use it as a maximum. */
|
|
p = memchr ((PTR) dp->d_name, '\0', D_NAMLEN (dp) + 1);
|
|
d->d_namlen = (p != NULL) ? p - dp->d_name : D_NAMLEN (dp);
|
|
memcpy (d->d_name, dp->d_name, d->d_namlen + 1);
|
|
d->d_type = DT_UNKNOWN;
|
|
d->d_reclen = &d->d_name[d->d_namlen + 1] - (char *) d;
|
|
return d;
|
|
}
|
|
}
|
|
}
|