fix srandom and initstate signatures (from enh at google)

This commit is contained in:
christos 2014-06-12 18:44:36 +00:00
parent 4a00503bb8
commit 1eb0dcbb1d
4 changed files with 79 additions and 6 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: stdlib.h,v 1.107 2014/01/08 02:16:03 christos Exp $ */
/* $NetBSD: stdlib.h,v 1.108 2014/06/12 18:45:14 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -174,10 +174,12 @@ int putenv(char *) __RENAME(__putenv50);
long a64l(const char *);
char *l64a(long);
char *initstate(unsigned long, char *, size_t);
long random(void);
char *setstate(char *);
void srandom(unsigned long);
#ifndef __LIBC12_SOURCE__
char *initstate(unsigned int, char *, size_t) __RENAME(__initstate70);
void srandom(unsigned int) __RENAME(__srandom70);
#endif
#ifdef _NETBSD_SOURCE
#define RANDOM_MAX 0x7fffffff /* (((long)1 << 31) - 1) */
#endif

View File

@ -1,4 +1,4 @@
/* $NetBSD: stdlib.h,v 1.5 2012/04/20 17:31:29 christos Exp $ */
/* $NetBSD: stdlib.h,v 1.6 2014/06/12 18:44:36 christos Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -42,6 +42,10 @@ int putenv(char *);
int __putenv50(char *);
__aconst char *devname(int32_t, mode_t);
__aconst char *__devname50(dev_t, mode_t);
char *initstate(unsigned long, char *, size_t);
char *__initstate70(unsigned int, char *, size_t);
void srandom(unsigned long);
void __srandom70(unsigned int);
__END_DECLS

View File

@ -1,5 +1,5 @@
# $NetBSD: Makefile.inc,v 1.3 2012/04/20 17:31:30 christos Exp $
# $NetBSD: Makefile.inc,v 1.4 2014/06/12 18:44:36 christos Exp $
.PATH: ${COMPATDIR}/stdlib
CPPFLAGS+=-I${COMPATDIR}/stdlib -I${COMPATDIR}/../stdlib
SRCS+=compat_putenv.c compat_unsetenv.c
SRCS+=compat_putenv.c compat_random.c compat_unsetenv.c

View File

@ -0,0 +1,67 @@
/* $NetBSD: compat_random.c,v 1.1 2014/06/12 18:44:36 christos Exp $ */
/*-
* Copyright (c) 2014 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_random.c,v 1.1 2014/06/12 18:44:36 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#define __LIBC12_SOURCE__
#include "namespace.h"
#include <assert.h>
#include <stdlib.h>
#include <compat/include/stdlib.h>
#include "env.h"
#include "reentrant.h"
#include "local.h"
#ifdef __weak_alias
__weak_alias(initstate,_initstate)
__weak_alias(srandom,_srandom)
#endif
__warn_references(initstate,
"warning: reference to compatibility initstate();"
" include <stdlib.h> for correct reference")
__warn_references(srandom,
"warning: reference to compatibility srandom();"
" include <stdlib.h> for correct reference")
char *
initstate(unsigned long seed, char * buf, size_t len) {
return __initstate70((unsigned int)seed, buf, len);
}
void
srandom(unsigned long seed) {
__srandom70((unsigned int)seed);
}