mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-20 11:11:24 +00:00
d201fe46e3
adding (weak definitions to) stubs for some of the pthread functions. If the threads library is linked in, the real pthread functions will pulled in. Use the following convention for system calls wrapped by the threads library: __sys_foo - actual system call _foo - weak definition to __sys_foo foo - weak definition to __sys_foo Change all libc uses of system calls wrapped by the threads library from foo to _foo. In order to define the prototypes for _foo(), we introduce namespace.h and un-namespace.h (suggested by bde). All files that need to reference these system calls, should include namespace.h before any standard includes, then include un-namespace.h after the standard includes and before any local includes. <db.h> is an exception and shouldn't be included in between namespace.h and un-namespace.h namespace.h will define foo to _foo, and un-namespace.h will undefine foo. Try to eliminate some of the recursive calls to MT-safe functions in libc/stdio in preparation for adding a mutex to FILE. We have recursive mutexes, but would like to avoid using them if possible. Remove uneeded includes of <errno.h> from a few files. Add $FreeBSD$ to a few files in order to pass commitprep. Approved by: -arch
136 lines
3.9 KiB
C
136 lines
3.9 KiB
C
/*
|
|
* Copyright (c) 1983, 1993
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
|
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
|
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
|
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
|
* SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char sccsid[] = "@(#)readdir.c 8.3 (Berkeley) 9/29/94";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#include "namespace.h"
|
|
#include <sys/param.h>
|
|
#include <dirent.h>
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
#include <pthread.h>
|
|
#include "un-namespace.h"
|
|
|
|
#include "libc_private.h"
|
|
|
|
/*
|
|
* get next entry in a directory.
|
|
*/
|
|
struct dirent *
|
|
_readdir_unlocked(dirp)
|
|
DIR *dirp;
|
|
{
|
|
struct dirent *dp;
|
|
|
|
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)) {
|
|
dirp->dd_size = _getdirentries(dirp->dd_fd,
|
|
dirp->dd_buf, dirp->dd_len, &dirp->dd_seek);
|
|
if (dirp->dd_size <= 0)
|
|
return (NULL);
|
|
}
|
|
dp = (struct dirent *)(dirp->dd_buf + dirp->dd_loc);
|
|
if ((long)dp & 03L) /* bogus pointer check */
|
|
return (NULL);
|
|
if (dp->d_reclen <= 0 ||
|
|
dp->d_reclen > dirp->dd_len + 1 - dirp->dd_loc)
|
|
return (NULL);
|
|
dirp->dd_loc += dp->d_reclen;
|
|
if (dp->d_ino == 0)
|
|
continue;
|
|
if (dp->d_type == DT_WHT && (dirp->dd_flags & DTF_HIDEW))
|
|
continue;
|
|
return (dp);
|
|
}
|
|
}
|
|
|
|
struct dirent *
|
|
readdir(dirp)
|
|
DIR *dirp;
|
|
{
|
|
struct dirent *dp;
|
|
|
|
if (__isthreaded) {
|
|
_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
|
|
dp = _readdir_unlocked(dirp);
|
|
_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
|
|
}
|
|
else
|
|
dp = _readdir_unlocked(dirp);
|
|
return (dp);
|
|
}
|
|
|
|
int
|
|
readdir_r(dirp, entry, result)
|
|
DIR *dirp;
|
|
struct dirent *entry;
|
|
struct dirent **result;
|
|
{
|
|
struct dirent *dp;
|
|
int saved_errno;
|
|
|
|
saved_errno = errno;
|
|
errno = 0;
|
|
if (__isthreaded) {
|
|
_pthread_mutex_lock((pthread_mutex_t *)&dirp->dd_lock);
|
|
if ((dp = _readdir_unlocked(dirp)) != NULL)
|
|
memcpy(entry, dp, sizeof *entry);
|
|
_pthread_mutex_unlock((pthread_mutex_t *)&dirp->dd_lock);
|
|
}
|
|
else if ((dp = _readdir_unlocked(dirp)) != NULL)
|
|
memcpy(entry, dp, sizeof *entry);
|
|
|
|
if (errno != 0) {
|
|
if (dp == NULL)
|
|
return (errno);
|
|
} else
|
|
errno = saved_errno;
|
|
|
|
if (dp != NULL)
|
|
*result = entry;
|
|
else
|
|
*result = NULL;
|
|
|
|
return (0);
|
|
}
|