diff options
author | 2009-11-18 07:43:22 +0000 | |
---|---|---|
committer | 2009-11-18 07:43:22 +0000 | |
commit | 2359975197ffa00213482093de8f8c5905ec9577 (patch) | |
tree | e19ea759830bca154c1208a7276418b8f1d3e688 /lib/libc/gen/readdir_r.c | |
parent | improve the bpf path. packets we send out via the bridge are seen, but (diff) | |
download | wireguard-openbsd-2359975197ffa00213482093de8f8c5905ec9577.tar.xz wireguard-openbsd-2359975197ffa00213482093de8f8c5905ec9577.zip |
More shrinkage, a bit for ramdisks but mostly for static binaries:
- wrap with #ifndef NO_LOG_BAD_DNS_RESPONSES libc code that uses
p_class() and p_type() for diagnostics, then add that define to
libstub to avoid pulling in res_debug_syms.o
- split rcmd() and ruserok() into separate files, as nothing uses both
- split readdir_r() to its own file
- split syslog_r() from syslog(), as the latter needs localtime(); many
binaries no longer need to pull in all the time code after this; switch
from usleep() to nanosleep() while we're at it
(The profit of analysis of -Wl,-M,--cref output)
Chops 888kB from /bin and /sbin on i386
ok deraadt@, miod@
Diffstat (limited to 'lib/libc/gen/readdir_r.c')
-rw-r--r-- | lib/libc/gen/readdir_r.c | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/lib/libc/gen/readdir_r.c b/lib/libc/gen/readdir_r.c new file mode 100644 index 00000000000..04a7fdc953f --- /dev/null +++ b/lib/libc/gen/readdir_r.c @@ -0,0 +1,56 @@ +/* $OpenBSD: readdir_r.c,v 1.1 2009/11/18 07:43:22 guenther Exp $ */ +/* + * 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. 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. + */ + +#include <sys/param.h> +#include <dirent.h> +#include <string.h> +#include <errno.h> +#include "thread_private.h" + +int +readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result) +{ + struct dirent *dp; + + _MUTEX_LOCK(&dirp->dd_lock); + if (_readdir_unlocked(dirp, &dp, 1) != 0) { + _MUTEX_UNLOCK(&dirp->dd_lock); + return errno; + } + if (dp != NULL) + memcpy(entry, dp, + sizeof (struct dirent) - MAXNAMLEN + dp->d_namlen); + _MUTEX_UNLOCK(&dirp->dd_lock); + if (dp != NULL) + *result = entry; + else + *result = NULL; + return 0; +} |