Module Name: src
Committed By: tls
Date: Sun Aug 10 07:03:53 UTC 2014
Modified Files:
src/include [tls-earlyentropy]: search.h stdio.h stdlib.h unistd.h
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.20.4.1 src/include/search.h
cvs rdiff -u -r1.88 -r1.88.4.1 src/include/stdio.h
cvs rdiff -u -r1.107 -r1.107.2.1 src/include/stdlib.h
cvs rdiff -u -r1.140 -r1.140.2.1 src/include/unistd.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/search.h
diff -u src/include/search.h:1.20 src/include/search.h:1.20.4.1
--- src/include/search.h:1.20 Sat Apr 27 21:35:25 2013
+++ src/include/search.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: search.h,v 1.20 2013/04/27 21:35:25 joerg Exp $ */
+/* $NetBSD: search.h,v 1.20.4.1 2014/08/10 07:03:53 tls Exp $ */
/*
* Written by J.T. Conklin <j...@netbsd.org>
@@ -62,8 +62,10 @@ void hdestroy(void);
ENTRY *hsearch(ENTRY, ACTION);
#ifdef _NETBSD_SOURCE
+void hdestroy1(void (*)(void *), void (*)(void *));
int hcreate_r(size_t, struct hsearch_data *);
void hdestroy_r(struct hsearch_data *);
+void hdestroy1_r(struct hsearch_data *, void (*)(void *), void (*)(void *));
int hsearch_r(ENTRY, ACTION, ENTRY **, struct hsearch_data *);
#endif /* _NETBSD_SOURCE */
Index: src/include/stdio.h
diff -u src/include/stdio.h:1.88 src/include/stdio.h:1.88.4.1
--- src/include/stdio.h:1.88 Sat May 4 18:30:14 2013
+++ src/include/stdio.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stdio.h,v 1.88 2013/05/04 18:30:14 christos Exp $ */
+/* $NetBSD: stdio.h,v 1.88.4.1 2014/08/10 07:03:53 tls Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -242,9 +242,6 @@ long ftell(FILE *);
size_t fwrite(const void * __restrict, size_t, size_t, FILE * __restrict);
int getc(FILE *);
int getchar(void);
-ssize_t getdelim(char ** __restrict, size_t * __restrict, int,
- FILE * __restrict);
-ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
void perror(const char *);
int printf(const char * __restrict, ...)
__printflike(1, 2);
@@ -461,9 +458,9 @@ __END_DECLS
#if defined(__GNUC__) && defined(__STDC__)
static __inline int __sputc(int _c, FILE *_p) {
if (--_p->_w >= 0 || (_p->_w >= _p->_lbfsize && (char)_c != '\n'))
- return (*_p->_p++ = _c);
+ return *_p->_p++ = (unsigned char)_c;
else
- return (__swbuf(_c, _p));
+ return __swbuf(_c, _p);
}
#else
/*
@@ -508,10 +505,12 @@ static __inline int __sputc(int _c, FILE
#endif /* !_ANSI_SOURCE && !__cplusplus*/
#if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
int vdprintf(int, const char * __restrict, __va_list)
__printflike(2, 0);
int dprintf(int, const char * __restrict, ...)
__printflike(2, 3);
+__END_DECLS
#endif /* (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE) */
#if (_POSIX_C_SOURCE - 0) >= 199506L || (_XOPEN_SOURCE - 0) >= 500 || \
@@ -525,7 +524,12 @@ int dprintf(int, const char * __restric
#if (_POSIX_C_SOURCE - 0) >= 200809L || (_XOPEN_SOURCE - 0) >= 700 || \
defined(_NETBSD_SOURCE)
+__BEGIN_DECLS
FILE *fmemopen(void * __restrict, size_t, const char * __restrict);
+ssize_t getdelim(char ** __restrict, size_t * __restrict, int,
+ FILE * __restrict);
+ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict);
+__END_DECLS
#endif
#if (_POSIX_C_SOURCE - 0) >= 200809L || defined(_NETBSD_SOURCE)
Index: src/include/stdlib.h
diff -u src/include/stdlib.h:1.107 src/include/stdlib.h:1.107.2.1
--- src/include/stdlib.h:1.107 Wed Jan 8 02:16:03 2014
+++ src/include/stdlib.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: stdlib.h,v 1.107 2014/01/08 02:16:03 christos Exp $ */
+/* $NetBSD: stdlib.h,v 1.107.2.1 2014/08/10 07:03:53 tls Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -174,12 +174,16 @@ 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(__initstate60);
+void srandom(unsigned int) __RENAME(__srandom60);
+#endif
#ifdef _NETBSD_SOURCE
#define RANDOM_MAX 0x7fffffff /* (((long)1 << 31) - 1) */
+int mkostemp(char *, int);
+int mkostemps(char *, int, int);
#endif
char *mkdtemp(char *);
Index: src/include/unistd.h
diff -u src/include/unistd.h:1.140 src/include/unistd.h:1.140.2.1
--- src/include/unistd.h:1.140 Thu Jan 2 23:33:50 2014
+++ src/include/unistd.h Sun Aug 10 07:03:53 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: unistd.h,v 1.140 2014/01/02 23:33:50 christos Exp $ */
+/* $NetBSD: unistd.h,v 1.140.2.1 2014/08/10 07:03:53 tls Exp $ */
/*-
* Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -173,6 +173,7 @@ ssize_t readlink(const char * __restric
*/
#if (_POSIX_C_SOURCE - 0) >= 200112L || (_XOPEN_SOURCE - 0) >= 600 || \
defined(_NETBSD_SOURCE)
+int posix_fallocate(int, off_t, off_t);
int setegid(gid_t);
int seteuid(uid_t);
#endif
@@ -328,6 +329,7 @@ int dup3(int, int, int);
void endusershell(void);
int exect(const char *, char * const *, char * const *);
int fchroot(int);
+int fdiscard(int, off_t, off_t);
int fsync_range(int, int, off_t, off_t);
int getdomainname(char *, size_t);
int getgrouplist(const char *, gid_t, gid_t *, int *);
@@ -353,6 +355,7 @@ __aconst char *getusershell(void);
int initgroups(const char *, gid_t);
int iruserok(uint32_t, int, const char *, const char *);
int issetugid(void);
+int mkstemps(char *, int);
int nfssvc(int, void *);
int pipe2(int *, int);
int profil(char *, size_t, u_long, u_int);
