* Updating common/lib * Updating lib/csu * Updating lib/libc * Updating libexec/ld.elf_so * Corrected test on __minix in featuretest to actually follow the meaning of the comment. * Cleaned up _REENTRANT-related defintions. * Disabled -D_REENTRANT for libfetch * Removing some unneeded __NBSD_LIBC defines and tests Change-Id: Ic1394baef74d11b9f86b312f5ff4bbc3cbf72ce2
		
			
				
	
	
		
			93 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			93 lines
		
	
	
		
			3.1 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*	$NetBSD: compat_getdents.c,v 1.6 2012/03/13 22:24:48 joerg Exp $	*/
 | 
						|
 | 
						|
/*-
 | 
						|
 * Copyright (c) 2005 The NetBSD Foundation, Inc.
 | 
						|
 * All rights reserved.
 | 
						|
 *
 | 
						|
 * This code is derived from software contributed to The NetBSD Foundation
 | 
						|
 * by Christos Zoulas.
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 *
 | 
						|
 * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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/cdefs.h>
 | 
						|
#if defined(LIBC_SCCS) && !defined(lint)
 | 
						|
__RCSID("$NetBSD: compat_getdents.c,v 1.6 2012/03/13 22:24:48 joerg Exp $");
 | 
						|
#endif /* LIBC_SCCS and not lint */
 | 
						|
 | 
						|
#define __LIBC12_SOURCE__
 | 
						|
 | 
						|
#include "namespace.h"
 | 
						|
#include <sys/types.h>
 | 
						|
#include <assert.h>
 | 
						|
#include <dirent.h>
 | 
						|
#include <stddef.h>
 | 
						|
#include <compat/include/dirent.h>
 | 
						|
#include <string.h>
 | 
						|
 | 
						|
/*
 | 
						|
 * libc12 compatible getdents routine.
 | 
						|
 */
 | 
						|
int
 | 
						|
getdents(int fd, char *buf, size_t nbytes)
 | 
						|
{
 | 
						|
	struct dirent *ndp, *nndp, *endp;
 | 
						|
	struct dirent12 *odp;
 | 
						|
	ino_t ino;
 | 
						|
	int rv;
 | 
						|
	size_t len;
 | 
						|
 | 
						|
	if ((rv = __getdents30(fd, buf, nbytes)) == -1)
 | 
						|
		return rv;
 | 
						|
 | 
						|
	odp = (struct dirent12 *)(void *)buf;
 | 
						|
	ndp = (struct dirent *)(void *)buf;
 | 
						|
	endp = (struct dirent *)(void *)&buf[rv];
 | 
						|
 | 
						|
	/*
 | 
						|
	 * In-place conversion. This works because odp
 | 
						|
	 * is smaller than ndp, but it has to be done
 | 
						|
	 * in the right sequence.
 | 
						|
	 */
 | 
						|
	for (; ndp < endp; ndp = nndp) {
 | 
						|
		nndp = _DIRENT_NEXT(ndp);
 | 
						|
		/* XXX: avoid unaligned 64-bit access on sparc64 */
 | 
						|
		/* XXX: does this work? */
 | 
						|
		memcpy(&ino, &ndp->d_ino, sizeof(ino_t));
 | 
						|
		odp->d_ino = (uint32_t)ino;
 | 
						|
		if (ndp->d_namlen >= sizeof(odp->d_name))
 | 
						|
			odp->d_namlen = sizeof(odp->d_name) - 1;
 | 
						|
		else
 | 
						|
			odp->d_namlen = (u_int8_t)ndp->d_namlen;
 | 
						|
		odp->d_type = ndp->d_type;
 | 
						|
		(void)memcpy(odp->d_name, ndp->d_name, (size_t)odp->d_namlen);
 | 
						|
		odp->d_name[odp->d_namlen] = '\0';
 | 
						|
		len = _DIRENT_SIZE(odp);
 | 
						|
		_DIAGASSERT(__type_fit(uint16_t, len));
 | 
						|
		odp->d_reclen = (uint16_t)len;
 | 
						|
		odp = _DIRENT_NEXT(odp);
 | 
						|
	}
 | 
						|
	ptrdiff_t td = (((char *)(void *)odp) - buf);
 | 
						|
	_DIAGASSERT(__type_fit(int, td));
 | 
						|
	return (int)td;
 | 
						|
}
 |