mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-29 10:37:50 +00:00
c150923988
* sysdeps/mach/libc-lock.h: New file.
* sysdeps/unix/readdir.c: Do locking.
* sysdeps/unix/seekdir.c: Likewise.
* sysdeps/unix/rewinddir.c: Likewise.
* sysdeps/unix/closedir.c: Likewise.
* sysdeps/unix/bsd/telldir.c: Likewise.
* sysdeps/mach/hurd/seekdir.c: Likewise.
* sysdeps/mach/hurd/readdir.c: Likewise.
* sysdeps/mach/hurd/closedir.c: Likewise.
* sysdeps/mach/hurd/opendir.c: Initialize the lock.
* sysdeps/unix/opendir.c: Likewise.
* sysdeps/mach/hurd/dirstream.h: Include <libc-lock.h>.
(struct __dirstream): Add lock member using __libc_lock_define.
* sysdeps/unix/dirstream.h: Likewise.
* sysdeps/stub/libc-lock.h (__libc_lock_fini): New macro.
* stdlib/mbstowcs.c: Pass address of pointer to mbsrtowcs.
* stdlib/wcstombs.c: Use wcsrtombs instead of mbsrtowcs.
Thu Jul 4 01:34:04 1996 Ulrich Drepper <drepper@cygnus.com>
* locale/programs/stringtrans.c: Fix typo in copyright.
* stdio-common/printf-prs.c: Add casts to prevent
signed<->unsigned warnings.
* stdio-common/printf-parse.h: Initialize state variable before
calling mbrlen.
* stdio-common/printf-prs.c: Don't initialize state variable here.
* stdio-common/vfprintf.c: Don't initialize state variable.
(vfprintf): While determining length of multibyte string don't
try to be clever in determining characters to use for first
call.
Add real implementation of multibyte<->wide char conversion
functions. The functions always convert between the fixed wide
char format (ISO 10646 in UCS4) and the UTF8 representation of
this character set. Conversion between the currently used
8bit character set and ISO 10646 will not take place. This is
what iconv() is for.
* wcsmbs/wchar.h (mbstate_t): Define as structure to replace
dummy definition.
Add optimized version of `mbrlen' function.
* wcsmbs/btowc.c (btowc): Restrict range of legal characters
to 0...0x7f.
* wcsmbs/wctob.c (wctob): Restrict range of legal characters
to 0..0x7f.
* wcsmbs/mbrlen.c: Make mbrlen a weak alias of __mbrlen.
This is needed in the wchar.h header.
* wcsmbs/mbrtowc.c: Replace dummy implementation. Convert UTF8
encoded character to UCS4.
* wcsmbs/mbsinit.c: Replace dummy implementation. Test COUNT
element of `mbstate_t' for initial state.
* wcsmbs/mbsrtowcs.c: Replace dummy implementation. Convert UTF8
encoded string to UCS4 string.
* wcsmbs/wcrtomb.c: Replace dummy implementation. Convert UCS4
character to UTF8 encoded form.
* wcsmbs/wcsrtombs.c: Replace dummy implementation. Convert UCS4
encoded string to UTF8 encoded form.
108 lines
2.6 KiB
C
108 lines
2.6 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;
|
|
}
|
|
|
|
__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;
|
|
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)
|
|
{
|
|
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;
|
|
}
|