[Midnightbsd-cvs] src: src/include: Merge changes.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Fri Oct 31 16:00:17 EDT 2008
Log Message:
-----------
Merge changes.
Modified Files:
--------------
src/include:
ctype.h (r1.1.1.1 -> r1.2)
dlfcn.h (r1.1.1.1 -> r1.2)
elf.h (r1.1.1.1 -> r1.2)
glob.h (r1.1.1.1 -> r1.2)
histedit.h (r1.1.1.1 -> r1.2)
kenv.h (r1.1.1.1 -> r1.2)
netdb.h (r1.1.1.1 -> r1.2)
nl_types.h (r1.1.1.2 -> r1.2)
nsswitch.h (r1.1.1.1 -> r1.2)
Removed Files:
-------------
src/include:
objformat.h
-------------- next part --------------
Index: histedit.h
===================================================================
RCS file: /home/cvs/src/include/histedit.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/histedit.h -L include/histedit.h -u -r1.1.1.1 -r1.2
--- include/histedit.h
+++ include/histedit.h
@@ -30,8 +30,8 @@
* SUCH DAMAGE.
*
* @(#)histedit.h 8.2 (Berkeley) 1/3/94
- * $NetBSD: histedit.h,v 1.28 2005/07/14 15:00:58 christos Exp $
- * $FreeBSD: src/include/histedit.h,v 1.9.10.1 2005/10/09 03:44:00 delphij Exp $
+ * $NetBSD: histedit.h,v 1.32 2007/06/10 20:20:28 christos Exp $
+ * $FreeBSD: src/include/histedit.h,v 1.12 2007/06/11 06:25:19 stefanf Exp $
*/
/*
@@ -104,7 +104,7 @@
* Low level editline access functions
*/
int el_set(EditLine *, int, ...);
-int el_get(EditLine *, int, void *);
+int el_get(EditLine *, int, ...);
#if 0
unsigned char _el_fn_complete(EditLine *, int);
#endif
@@ -130,8 +130,11 @@
#define EL_CLIENTDATA 14 /* , void *); */
#define EL_UNBUFFERED 15 /* , int); */
#define EL_PREP_TERM 16 /* , int); */
+#define EL_GETTC 17 /* , const char *, ..., NULL); */
+#define EL_GETFP 18 /* , int, FILE **) */
+#define EL_SETFP 19 /* , int, FILE *) */
-#define EL_BUILTIN_GETCFN (NULL)
+#define EL_BUILTIN_GETCFN (NULL)
/*
* Source named file or $PWD/.editrc or $HOME/.editrc
@@ -181,7 +184,7 @@
#define H_FUNC 0 /* , UTSL */
#define H_SETSIZE 1 /* , const int); */
-#define H_EVENT 1 /* , const int); */
+#define H_EVENT 1 /* , const int); */
#define H_GETSIZE 2 /* , void); */
#define H_FIRST 3 /* , void); */
#define H_LAST 4 /* , void); */
Index: netdb.h
===================================================================
RCS file: /home/cvs/src/include/netdb.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/netdb.h -L include/netdb.h -u -r1.1.1.1 -r1.2
--- include/netdb.h
+++ include/netdb.h
@@ -55,7 +55,7 @@
/*
* @(#)netdb.h 8.1 (Berkeley) 6/2/93
* From: Id: netdb.h,v 8.9 1996/11/19 08:39:29 vixie Exp $
- * $FreeBSD: src/include/netdb.h,v 1.38.2.1 2005/07/22 20:17:30 ume Exp $
+ * $FreeBSD: src/include/netdb.h,v 1.44 2006/05/21 11:27:28 ume Exp $
*/
#ifndef _NETDB_H_
@@ -87,7 +87,7 @@
#define _PATH_PROTOCOLS "/etc/protocols"
#define _PATH_SERVICES "/etc/services"
-#define h_errno (*__h_error())
+#define h_errno (*__h_errno())
/*
* Structures returned by network data base library. All addresses are
@@ -167,9 +167,10 @@
#define EAI_SERVICE 9 /* servname not supported for ai_socktype */
#define EAI_SOCKTYPE 10 /* ai_socktype not supported */
#define EAI_SYSTEM 11 /* system error returned in errno */
-#define EAI_BADHINTS 12
-#define EAI_PROTOCOL 13
-#define EAI_MAX 14
+#define EAI_BADHINTS 12 /* invalid value for hints */
+#define EAI_PROTOCOL 13 /* resolved protocol is unknown */
+#define EAI_OVERFLOW 14 /* argument buffer overflow */
+#define EAI_MAX 15
/*
* Flag values for getaddrinfo()
@@ -220,22 +221,48 @@
void endprotoent(void);
void endservent(void);
void freehostent(struct hostent *);
-struct hostent *gethostbyaddr(const char *, int, int);
+struct hostent *gethostbyaddr(const void *, socklen_t, int);
+int gethostbyaddr_r(const void *, socklen_t, int, struct hostent *,
+ char *, size_t, struct hostent **, int *);
struct hostent *gethostbyname(const char *);
+int gethostbyname_r(const char *, struct hostent *, char *, size_t,
+ struct hostent **, int *);
struct hostent *gethostbyname2(const char *, int);
+int gethostbyname2_r(const char *, int, struct hostent *, char *,
+ size_t, struct hostent **, int *);
struct hostent *gethostent(void);
+int gethostent_r(struct hostent *, char *, size_t,
+ struct hostent **, int *);
struct hostent *getipnodebyaddr(const void *, size_t, int, int *);
struct hostent *getipnodebyname(const char *, int, int, int *);
struct netent *getnetbyaddr(uint32_t, int);
+int getnetbyaddr_r(uint32_t, int, struct netent *, char *, size_t,
+ struct netent**, int *);
struct netent *getnetbyname(const char *);
+int getnetbyname_r(const char *, struct netent *, char *, size_t,
+ struct netent **, int *);
struct netent *getnetent(void);
+int getnetent_r(struct netent *, char *, size_t, struct netent **,
+ int *);
int getnetgrent(char **, char **, char **);
struct protoent *getprotobyname(const char *);
+int getprotobyname_r(const char *, struct protoent *, char *,
+ size_t, struct protoent **);
struct protoent *getprotobynumber(int);
+int getprotobynumber_r(int, struct protoent *, char *, size_t,
+ struct protoent **);
struct protoent *getprotoent(void);
+int getprotoent_r(struct protoent *, char *, size_t,
+ struct protoent **);
struct servent *getservbyname(const char *, const char *);
+int getservbyname_r(const char *, const char *, struct servent *,
+ char *, size_t, struct servent **);
struct servent *getservbyport(int, const char *);
+int getservbyport_r(int, const char *, struct servent *, char *,
+ size_t, struct servent **);
struct servent *getservent(void);
+int getservent_r(struct servent *, char *, size_t,
+ struct servent **);
void herror(const char *);
__const char *hstrerror(int);
int innetgr(const char *, const char *, const char *, const char *);
@@ -257,7 +284,7 @@
*/
/* DO NOT USE THESE, THEY ARE SUBJECT TO CHANGE AND ARE NOT PORTABLE!!! */
-int * __h_error(void);
+int * __h_errno(void);
__END_DECLS
#endif /* !_NETDB_H_ */
Index: nl_types.h
===================================================================
RCS file: /home/cvs/src/include/nl_types.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -L include/nl_types.h -L include/nl_types.h -u -r1.1.1.2 -r1.2
--- include/nl_types.h
+++ include/nl_types.h
@@ -35,7 +35,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/include/nl_types.h,v 1.11.2.2 2006/02/01 12:24:39 stefanf Exp $
+ * $FreeBSD: src/include/nl_types.h,v 1.12 2006/01/26 20:53:40 stefanf Exp $
*/
#ifndef _NL_TYPES_H_
@@ -97,10 +97,6 @@
__BEGIN_DECLS
nl_catd catopen(const char *, int);
-/* Work-around for old <sys/cdefs.h> */
-#ifndef __format_arg
-#define __format_arg(a) __attribute__((__format_arg__(a)))
-#endif
char *catgets(nl_catd, int, int, const char *) __format_arg(4);
int catclose(nl_catd);
__END_DECLS
Index: ctype.h
===================================================================
RCS file: /home/cvs/src/include/ctype.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/ctype.h -L include/ctype.h -u -r1.1.1.1 -r1.2
--- include/ctype.h
+++ include/ctype.h
@@ -39,7 +39,7 @@
* SUCH DAMAGE.
*
* @(#)ctype.h 8.4 (Berkeley) 1/21/94
- * $FreeBSD: src/include/ctype.h,v 1.28 2004/08/12 09:33:47 tjr Exp $
+ * $FreeBSD: src/include/ctype.h,v 1.28.18.1 2007/10/24 14:29:31 rafan Exp $
*/
#ifndef _CTYPE_H_
@@ -86,19 +86,19 @@
#endif
__END_DECLS
-#define isalnum(c) __istype((c), _CTYPE_A|_CTYPE_D)
-#define isalpha(c) __istype((c), _CTYPE_A)
-#define iscntrl(c) __istype((c), _CTYPE_C)
+#define isalnum(c) __sbistype((c), _CTYPE_A|_CTYPE_D)
+#define isalpha(c) __sbistype((c), _CTYPE_A)
+#define iscntrl(c) __sbistype((c), _CTYPE_C)
#define isdigit(c) __isctype((c), _CTYPE_D) /* ANSI -- locale independent */
-#define isgraph(c) __istype((c), _CTYPE_G)
-#define islower(c) __istype((c), _CTYPE_L)
-#define isprint(c) __istype((c), _CTYPE_R)
-#define ispunct(c) __istype((c), _CTYPE_P)
-#define isspace(c) __istype((c), _CTYPE_S)
-#define isupper(c) __istype((c), _CTYPE_U)
+#define isgraph(c) __sbistype((c), _CTYPE_G)
+#define islower(c) __sbistype((c), _CTYPE_L)
+#define isprint(c) __sbistype((c), _CTYPE_R)
+#define ispunct(c) __sbistype((c), _CTYPE_P)
+#define isspace(c) __sbistype((c), _CTYPE_S)
+#define isupper(c) __sbistype((c), _CTYPE_U)
#define isxdigit(c) __isctype((c), _CTYPE_X) /* ANSI -- locale independent */
-#define tolower(c) __tolower(c)
-#define toupper(c) __toupper(c)
+#define tolower(c) __sbtolower(c)
+#define toupper(c) __sbtoupper(c)
#if __XSI_VISIBLE
/*
@@ -112,24 +112,24 @@
*
* XXX isascii() and toascii() should similarly be undocumented.
*/
-#define _tolower(c) __tolower(c)
-#define _toupper(c) __toupper(c)
+#define _tolower(c) __sbtolower(c)
+#define _toupper(c) __sbtoupper(c)
#define isascii(c) (((c) & ~0x7F) == 0)
#define toascii(c) ((c) & 0x7F)
#endif
#if __ISO_C_VISIBLE >= 1999
-#define isblank(c) __istype((c), _CTYPE_B)
+#define isblank(c) __sbistype((c), _CTYPE_B)
#endif
#if __BSD_VISIBLE
-#define digittoint(c) __maskrune((c), 0xFF)
-#define ishexnumber(c) __istype((c), _CTYPE_X)
-#define isideogram(c) __istype((c), _CTYPE_I)
-#define isnumber(c) __istype((c), _CTYPE_D)
-#define isphonogram(c) __istype((c), _CTYPE_Q)
-#define isrune(c) __istype((c), 0xFFFFFF00L)
-#define isspecial(c) __istype((c), _CTYPE_T)
+#define digittoint(c) __sbmaskrune((c), 0xFF)
+#define ishexnumber(c) __sbistype((c), _CTYPE_X)
+#define isideogram(c) __sbistype((c), _CTYPE_I)
+#define isnumber(c) __sbistype((c), _CTYPE_D)
+#define isphonogram(c) __sbistype((c), _CTYPE_Q)
+#define isrune(c) __sbistype((c), 0xFFFFFF00L)
+#define isspecial(c) __sbistype((c), _CTYPE_T)
#endif
#endif /* !_CTYPE_H_ */
--- include/objformat.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 1998 John D. Polstra
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
- *
- * $FreeBSD: src/include/objformat.h,v 1.2 1999/08/27 23:44:51 peter Exp $
- */
-
-#ifndef _OBJFORMAT_H_
-#define _OBJFORMAT_H_
-
-#include <sys/cdefs.h>
-#include <stddef.h>
-
-__BEGIN_DECLS
-int getobjformat(char *, size_t, int *, char **);
-__END_DECLS
-
-#endif /* _OBJFORMAT_H_ */
Index: elf.h
===================================================================
RCS file: /home/cvs/src/include/elf.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/elf.h -L include/elf.h -u -r1.1.1.1 -r1.2
--- include/elf.h
+++ include/elf.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/elf.h,v 1.8 2002/07/04 11:05:39 markm Exp $
+ * $FreeBSD: src/include/elf.h,v 1.9 2006/10/04 07:25:55 jb Exp $
*/
/*
@@ -38,4 +38,8 @@
#include <sys/elf32.h>
#include <sys/elf64.h>
+#ifdef _SOLARIS_C_SOURCE
+#include <sys/_elf_solaris.h>
+#endif
+
#endif /* !_ELF_H_ */
Index: glob.h
===================================================================
RCS file: /home/cvs/src/include/glob.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/glob.h -L include/glob.h -u -r1.1.1.1 -r1.2
--- include/glob.h
+++ include/glob.h
@@ -34,19 +34,25 @@
* SUCH DAMAGE.
*
* @(#)glob.h 8.1 (Berkeley) 6/2/93
- * $FreeBSD: src/include/glob.h,v 1.7 2002/07/17 04:58:09 mikeh Exp $
+ * $FreeBSD: src/include/glob.h,v 1.10 2006/05/22 05:57:39 ache Exp $
*/
#ifndef _GLOB_H_
#define _GLOB_H_
#include <sys/cdefs.h>
+#include <sys/_types.h>
+
+#ifndef _SIZE_T_DECLARED
+typedef __size_t size_t;
+#define _SIZE_T_DECLARED
+#endif
struct stat;
typedef struct {
- int gl_pathc; /* Count of total paths so far. */
- int gl_matchc; /* Count of paths matching pattern. */
- int gl_offs; /* Reserved at beginning of gl_pathv. */
+ size_t gl_pathc; /* Count of total paths so far. */
+ size_t gl_matchc; /* Count of paths matching pattern. */
+ size_t gl_offs; /* Reserved at beginning of gl_pathv. */
int gl_flags; /* Copy of flags parameter to glob. */
char **gl_pathv; /* List of paths matching pattern. */
/* Copy of errfunc parameter to glob. */
Index: nsswitch.h
===================================================================
RCS file: /home/cvs/src/include/nsswitch.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/nsswitch.h -L include/nsswitch.h -u -r1.1.1.1 -r1.2
--- include/nsswitch.h
+++ include/nsswitch.h
@@ -1,5 +1,5 @@
/* $NetBSD: nsswitch.h,v 1.6 1999/01/26 01:04:07 lukem Exp $ */
-/* $FreeBSD: src/include/nsswitch.h,v 1.3 2003/04/17 14:14:21 nectar Exp $ */
+/* $FreeBSD: src/include/nsswitch.h,v 1.4 2006/04/28 12:03:34 ume Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -68,6 +68,7 @@
#define NSSRC_DNS "dns" /* DNS; IN for hosts, HS for others */
#define NSSRC_NIS "nis" /* YP/NIS */
#define NSSRC_COMPAT "compat" /* passwd,group in YP compat mode */
+#define NSSRC_CACHE "cache" /* cache daemon */
/*
* currently implemented databases
@@ -80,6 +81,11 @@
#define NSDB_PASSWD "passwd"
#define NSDB_PASSWD_COMPAT "passwd_compat"
#define NSDB_SHELLS "shells"
+#define NSDB_SERVICES "services"
+#define NSDB_SERVICES_COMPAT "services_compat"
+#define NSDB_SSH_HOSTKEYS "ssh_hostkeys"
+#define NSDB_PROTOCOLS "protocols"
+#define NSDB_RPC "rpc"
/*
* suggested databases to implement
@@ -93,11 +99,8 @@
#define NSDB_NETMASKS "netmasks"
#define NSDB_PHONES "phones"
#define NSDB_PRINTCAP "printcap"
-#define NSDB_PROTOCOLS "protocols"
#define NSDB_REMOTE "remote"
-#define NSDB_RPC "rpc"
#define NSDB_SENDMAILVARS "sendmailvars"
-#define NSDB_SERVICES "services"
#define NSDB_TERMCAP "termcap"
#define NSDB_TTYS "ttys"
@@ -193,7 +196,6 @@
};
#ifdef _NS_PRIVATE
-
/*
* private data structures for back-end nsswitch implementation
*/
Index: kenv.h
===================================================================
RCS file: /home/cvs/src/include/kenv.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/kenv.h -L include/kenv.h -u -r1.1.1.1 -r1.2
--- include/kenv.h
+++ include/kenv.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/kenv.h,v 1.1 2002/04/17 13:06:32 mux Exp $
+ * $FreeBSD: src/include/kenv.h,v 1.2 2005/11/24 07:20:26 ru Exp $
*/
#ifndef _KENV_H_
@@ -33,7 +33,7 @@
#include <sys/kenv.h>
__BEGIN_DECLS
-int kenv(int, char *, char *, int);
+int kenv(int, const char *, char *, int);
__END_DECLS
#endif /* !_KENV_H_ */
Index: dlfcn.h
===================================================================
RCS file: /home/cvs/src/include/dlfcn.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L include/dlfcn.h -L include/dlfcn.h -u -r1.1.1.1 -r1.2
--- include/dlfcn.h
+++ include/dlfcn.h
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/include/dlfcn.h,v 1.19 2003/02/13 17:47:43 kan Exp $
+ * $FreeBSD: src/include/dlfcn.h,v 1.20 2005/12/18 19:43:31 kan Exp $
*/
#ifndef _DLFCN_H_
@@ -131,6 +131,8 @@
void (*_lock_release)(void *_lock),
void (*_lock_destroy)(void *_lock),
void (*_context_destroy)(void *_context));
+void *dlvsym(void * __restrict, const char * __restrict,
+ const char * __restrict);
#endif /* __BSD_VISIBLE */
__END_DECLS
More information about the Midnightbsd-cvs
mailing list