Libraries updates and cleanup
* 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
This commit is contained in:
23
lib/libc/compat/stdio/Makefile.inc
Normal file
23
lib/libc/compat/stdio/Makefile.inc
Normal file
@@ -0,0 +1,23 @@
|
||||
# $NetBSD: Makefile.inc,v 1.1 2012/01/22 18:36:18 christos Exp $
|
||||
|
||||
.PATH: ${COMPATDIR}/arch/${MACHINE_ARCH}/stdio ${COMPATDIR}/stdio
|
||||
|
||||
SRCS+= compat_fgetpos.c compat_fsetpos.c
|
||||
CPPFLAGS.compat_fgetpos.c+= -I${COMPATDIR}/../stdio
|
||||
CPPFLAGS.compat_fsetpos.c+= -I${COMPATDIR}/../stdio
|
||||
# $NetBSD: Makefile.inc,v 1.1 2012/01/22 18:36:18 christos Exp $
|
||||
|
||||
.ifndef ABSTOP
|
||||
ABSTOP!= cd ${.PARSEDIR}; pwd
|
||||
|
||||
.if (${.PARSEDIR} == ${.CURDIR})
|
||||
RELTOP:= .
|
||||
.else
|
||||
RELTOP:= ${.PARSEDIR:S,^${.CURDIR},,}
|
||||
.endif
|
||||
|
||||
# you can set BSD{SRC,OBJ}DIR in Makefile.local.inc
|
||||
.if exists(${ABSTOP}/Makefile.local.inc)
|
||||
.include "${ABSTOP}/Makefile.local.inc"
|
||||
.endif
|
||||
.endif
|
||||
64
lib/libc/compat/stdio/compat_fgetpos.c
Normal file
64
lib/libc/compat/stdio/compat_fgetpos.c
Normal file
@@ -0,0 +1,64 @@
|
||||
/* $NetBSD: compat_fgetpos.c,v 1.1 2012/01/22 18:36:18 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to Berkeley by
|
||||
* Chris Torek.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Original version ID:
|
||||
* NetBSD: fgetpos.c,v 1.11 2003/08/07 16:43:23 agc Exp
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: compat_fgetpos.c,v 1.1 2012/01/22 18:36:18 christos Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#define __LIBC12_SOURCE__
|
||||
|
||||
#include "namespace.h"
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <compat/include/stdio.h>
|
||||
|
||||
#ifdef __warn_references
|
||||
__warn_references(fgetpos,
|
||||
"warning: reference to compatibility fgetpos(); include <stdio.h> for correct reference")
|
||||
#endif
|
||||
|
||||
int
|
||||
fgetpos(FILE * __restrict fp, off_t * __restrict pos)
|
||||
{
|
||||
_DIAGASSERT(fp != NULL);
|
||||
_DIAGASSERT(pos != NULL);
|
||||
|
||||
return (*pos = ftello(fp)) == (off_t)-1;
|
||||
}
|
||||
68
lib/libc/compat/stdio/compat_fsetpos.c
Normal file
68
lib/libc/compat/stdio/compat_fsetpos.c
Normal file
@@ -0,0 +1,68 @@
|
||||
/* $NetBSD: compat_fsetpos.c,v 1.1 2012/01/22 18:36:19 christos Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1990, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* This code is derived from software contributed to Berkeley by
|
||||
* Chris Torek.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* Original version ID:
|
||||
* NetBSD: fsetpos.c,v 1.10 2003/08/07 16:43:25 agc Exp
|
||||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#if defined(LIBC_SCCS) && !defined(lint)
|
||||
__RCSID("$NetBSD: compat_fsetpos.c,v 1.1 2012/01/22 18:36:19 christos Exp $");
|
||||
#endif /* LIBC_SCCS and not lint */
|
||||
|
||||
#define __LIBC12_SOURCE__
|
||||
|
||||
#include "namespace.h"
|
||||
#include <sys/types.h>
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <compat/include/stdio.h>
|
||||
|
||||
#ifdef __warn_references
|
||||
__warn_references(fsetpos,
|
||||
"warning: reference to compatibility fsetpos(); include <stdio.h> for correc t reference")
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* fsetpos: like fseek.
|
||||
*/
|
||||
int
|
||||
fsetpos(FILE * __restrict iop, const off_t * __restrict pos)
|
||||
{
|
||||
_DIAGASSERT(iop != NULL);
|
||||
_DIAGASSERT(pos != NULL);
|
||||
|
||||
return fseeko(iop, *pos, SEEK_SET) == (off_t)-1;
|
||||
}
|
||||
Reference in New Issue
Block a user