Some more major updates to further superate ucLibc from the kernel

headers (the way it has been done in GNU libc).
 -Erik

11 files changed, 1113 insertions, 407 deletions

diff --git a/include/sys/bitypes.h b/include/sys/bitypes.h
index ec7781a9d..21aaf7436 100644
--- a/include/sys/bitypes.h
+++ b/include/sys/bitypes.h
@@ -1,94 +1 @@
-/*
- * bitypes.h,v 1.4 1995/08/24 01:58:54 hjl Exp
- */
-
-/*
- * ++Copyright++ 1993
- * -
- * Copyright (c) 1993 Regents of the University of California.
- * 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.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- * 	This product includes software developed by the University of
- * 	California, Berkeley and its contributors.
- * 4. 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.
- * -
- * Portions Copyright (c) 1993 by Digital Equipment Corporation.
- * 
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies, and that
- * the name of Digital Equipment Corporation not be used in advertising or
- * publicity pertaining to distribution of the document or software without
- * specific, written prior permission.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
- * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * -
- * --Copyright--
- */
-
-/*
-#ifdef __USE_BSD
-*/
-
-/*
-#ifndef __BIT_TYPES_DEFINED__
-# if (defined(BSD) && (BSD >= 199306)) || \
-     (defined(_BSDI_VERSION) && (_BSDI_VERSION >= 199312)) 
-#  define __BIT_TYPES_DEFINED__
-# endif
-#endif
-*/
-
-#ifndef __BIT_TYPES_DEFINED__
-#define __BIT_TYPES_DEFINED__
-
-	/*
-	 * Basic integral types.  Omit the typedef if
-	 * not possible for a machine/compiler combination.
-	 */
-	typedef /*signed*/ char            int8_t;
-	typedef unsigned char            u_int8_t;
-	typedef short                     int16_t;
-	typedef unsigned short          u_int16_t;
-	typedef int                       int32_t;
-	typedef unsigned int            u_int32_t;
-#if 0
-# if __GNUC__ >= 2 && !defined(__STRICT_ANSI__)
-	typedef long long                 int64_t;
-	typedef unsigned long long      u_int64_t;
-# endif
-#endif
-#endif	/* __BIT_TYPES_DEFINED__ */
-
-/* #endif  __USE_BSD */
+#include <stddef.h>
diff --git a/include/sys/ioctl.h b/include/sys/ioctl.h
index 11dd06edb..acb42f2b3 100644
--- a/include/sys/ioctl.h
+++ b/include/sys/ioctl.h
@@ -1,17 +1,46 @@
-#ifndef _SYS_IOCTL_H
-#define _SYS_IOCTL_H
+/* Copyright (C) 1991, 92, 93, 94, 96, 98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef	_SYS_IOCTL_H
+#define	_SYS_IOCTL_H	1
 
-#include <linux/ioctl.h>
 #include <features.h>
-#include <termios.h>
-#include <sys/socketio.h>
 
 __BEGIN_DECLS
 
-extern int	ioctl __P ((int __fildes, int __cmd, ...));
-extern int	__ioctl __P ((int __fildes, int __cmd, ...));
+/* Get the list of `ioctl' requests and related constants.  */
+#include <bits/ioctls.h>
 
-__END_DECLS
+/* Define some types used by `ioctl' requests.  */
+#include <bits/ioctl-types.h>
+
+/* On a Unix system, the system <sys/ioctl.h> probably defines some of
+   the symbols we define in <sys/ttydefaults.h> (usually with the same
+   values).  The code to generate <bits/ioctls.h> has omitted these
+   symbols to avoid the conflict, but a Unix program expects <sys/ioctl.h>
+   to define them, so we must include <sys/ttydefaults.h> here.  */
+#include <sys/ttydefaults.h>
 
+/* Perform the I/O control operation specified by REQUEST on FD.
+   One argument may follow; its presence and type depend on REQUEST.
+   Return value depends on REQUEST.  Usually -1 indicates error.  */
+extern int ioctl __P ((int __fd, unsigned long int __request, ...));
+
+__END_DECLS
 
-#endif
+#endif /* sys/ioctl.h */
diff --git a/include/sys/select.h b/include/sys/select.h
new file mode 100644
index 000000000..0972560b9
--- /dev/null
+++ b/include/sys/select.h
@@ -0,0 +1,95 @@
+/* `fd_set' type and related macros, and `select'/`pselect' declarations.
+   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/*	POSIX 1003.1g: 6.2 Select from File Descriptor Sets <sys/select.h>  */
+
+#ifndef _SYS_SELECT_H
+#define _SYS_SELECT_H	1
+
+#include <features.h>
+
+/* Get definition of needed basic types.  */
+#include <bits/types.h>
+
+/* Get __FD_* definitions.  */
+#include <bits/select.h>
+
+/* Get __sigset_t.  */
+#include <bits/sigset.h>
+
+/* Get definition of timer specification structures.  */
+#define __need_timespec
+#include <time.h>
+
+__BEGIN_DECLS
+
+/* This declaration puts `struct timeval' in global scope even if
+   <sys/time.h> has not been included to define it.  That way the
+   `select' prototype below will not conflict with a later definition
+   of `struct timeval'.  */
+struct timeval;
+
+typedef __fd_mask fd_mask;
+
+/* Representation of a set of file descriptors.  */
+typedef __fd_set fd_set;
+
+/* Maximum number of file descriptors in `fd_set'.  */
+#define	FD_SETSIZE		__FD_SETSIZE
+
+#ifdef __USE_MISC
+/* Number of bits per word of `fd_set' (some code assumes this is 32).  */
+# define NFDBITS		__NFDBITS
+#endif
+
+
+/* Access macros for `fd_set'.  */
+#define	FD_SET(fd, fdsetp)	__FD_SET ((fd), (fdsetp))
+#define	FD_CLR(fd, fdsetp)	__FD_CLR ((fd), (fdsetp))
+#define	FD_ISSET(fd, fdsetp)	__FD_ISSET ((fd), (fdsetp))
+#define	FD_ZERO(fdsetp)		__FD_ZERO (fdsetp)
+
+
+/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
+   readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
+   (if not NULL) for exceptional conditions.  If TIMEOUT is not NULL, time out
+   after waiting the interval specified therein.  Returns the number of ready
+   descriptors, or -1 for errors.  */
+extern int __select __P ((int __nfds, __fd_set *__readfds,
+			  __fd_set *__writefds, __fd_set *__exceptfds,
+			  struct timeval *__timeout));
+extern int select __P ((int __nfds, __fd_set *__readfds,
+			__fd_set *__writefds, __fd_set *__exceptfds,
+			struct timeval *__timeout));
+
+#ifdef __USE_GNU
+/* XXX Once/if POSIX.1g gets official this prototype will be available
+   when defining __USE_POSIX.  */
+/* Same as above only that the TIMEOUT value is given with higher
+   resolution and a sigmask which is been set temporarily.  This version
+   should be used.  */
+extern int pselect __P ((int __nfds, __fd_set *__readfds,
+			 __fd_set *__writefds, __fd_set *__exceptfds,
+			 const struct timespec *__timeout,
+			 const __sigset_t *__sigmask));
+#endif
+
+__END_DECLS
+
+#endif /* sys/select.h */
diff --git a/include/sys/socket.h b/include/sys/socket.h
index 3a898ee13..7642e7502 100644
--- a/include/sys/socket.h
+++ b/include/sys/socket.h
@@ -1,136 +1,207 @@
-#ifndef _SYS_SOCKET_H
-#define _SYS_SOCKET_H
+/* Declarations of socket constants, types, and functions.
+   Copyright (C) 1991,92,94,95,96,97,98,99 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef	_SYS_SOCKET_H
+#define	_SYS_SOCKET_H	1
 
 #include <features.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <linux/socket.h>
 
-#ifdef _MIT_POSIX_THREADS
-#include <pthread/mit/posix.h>
+__BEGIN_DECLS
+
+#define	__need_size_t
+#include <stddef.h>
+
+
+/* This operating system-specific header file defines the SOCK_*, PF_*,
+   AF_*, MSG_*, SOL_*, and SO_* constants, and the `struct sockaddr',
+   `struct msghdr', and `struct linger' types.  */
+#include <bits/socket.h>
+
+#ifdef __USE_BSD
+/* This is the 4.3 BSD `struct sockaddr' format, which is used as wire
+   format in the grotty old 4.3 `talk' protocol.  */
+struct osockaddr
+  {
+    unsigned short int sa_family;
+    unsigned char sa_data[14];
+  };
 #endif
 
-__BEGIN_DECLS
+/* The following constants should be used for the second parameter of
+   `shutdown'.  */
+enum
+{
+  SHUT_RD = 0,		/* No more receptions.  */
+#define SHUT_RD		SHUT_RD
+  SHUT_WR,		/* No more transmissions.  */
+#define SHUT_WR		SHUT_WR
+  SHUT_RDWR		/* No more receptions or transmissions.  */
+#define SHUT_RDWR	SHUT_RDWR
+};
+
+/* This is the type we use for generic socket address arguments.
+
+   With GCC 2.7 and later, the funky union causes redeclarations or
+   uses with any of the listed types to be allowed without complaint.
+   G++ 2.7 does not support transparent unions so there we want the
+   old-style declaration, too.  */
+#if	(!defined __GNUC__ || __GNUC__ < 2 || defined __cplusplus || \
+	 (__GNUC__ == 2 && __GNUC_MINOR__ < 7))
+# define __SOCKADDR_ARG		struct sockaddr *
+# define __CONST_SOCKADDR_ARG	__const struct sockaddr *
+#else
+/* Add more `struct sockaddr_AF' types here as necessary.
+   These are all the ones I found on NetBSD and Linux.  */
+# define __SOCKADDR_ALLTYPES \
+  __SOCKADDR_ONETYPE (sockaddr) \
+  __SOCKADDR_ONETYPE (sockaddr_at) \
+  __SOCKADDR_ONETYPE (sockaddr_ax25) \
+  __SOCKADDR_ONETYPE (sockaddr_dl) \
+  __SOCKADDR_ONETYPE (sockaddr_eon) \
+  __SOCKADDR_ONETYPE (sockaddr_in) \
+  __SOCKADDR_ONETYPE (sockaddr_in6) \
+  __SOCKADDR_ONETYPE (sockaddr_inarp) \
+  __SOCKADDR_ONETYPE (sockaddr_ipx) \
+  __SOCKADDR_ONETYPE (sockaddr_iso) \
+  __SOCKADDR_ONETYPE (sockaddr_ns) \
+  __SOCKADDR_ONETYPE (sockaddr_un) \
+  __SOCKADDR_ONETYPE (sockaddr_x25)
+
+# define __SOCKADDR_ONETYPE(type) struct type *__##type##__;
+typedef union { __SOCKADDR_ALLTYPES
+	      } __SOCKADDR_ARG __attribute__ ((__transparent_union__));
+# undef __SOCKADDR_ONETYPE
+# define __SOCKADDR_ONETYPE(type) __const struct type *__##type##__;
+typedef union { __SOCKADDR_ALLTYPES
+	      } __CONST_SOCKADDR_ARG __attribute__ ((__transparent_union__));
+# undef __SOCKADDR_ONETYPE
+#endif
 
-/* struct msghdr is not defined in linux 1.2.  This will allow sendmsg
-   and recvmsg in libc 5.2.9 to compile under 1.2.x and shouldn't cause
-   any problem for 1.3.x */
-struct msghdr;
 
 /* Create a new socket of type TYPE in domain DOMAIN, using
-   protocol PROTOCOL.  If PROTOCOL is zero, one is chosen
-   automatically.  Returns a file descriptor for the new socket,
-   or -1 for errors.  */
-int socket __P ((int __family, int __type, int __protocol));
+   protocol PROTOCOL.  If PROTOCOL is zero, one is chosen automatically.
+   Returns a file descriptor for the new socket, or -1 for errors.  */
+extern int socket __P ((int __domain, int __type, int __protocol));
 
 /* Create two new sockets, of type TYPE in domain DOMAIN and using
    protocol PROTOCOL, which are connected to each other, and put file
    descriptors for them in FDS[0] and FDS[1].  If PROTOCOL is zero,
-   one will be chosen automatically.  Returns 0 on success, -1
-   for errors.  */
-int socketpair __P ((int __family, int __type, int __protocol,
-		int __sockvec[2]));
-
-/* Give the socket FD the local address ADDR (which is LEN bytes
-   long).  */
-int bind __P ((int __sockfd, __const struct sockaddr *__my_addr,
-		int __addrlen));
-
-/* Open a connection on socket FD to peer at ADDR (which LEN bytes
-   long). For connectionless socket types, just set the default
-   address to send to and the only address from which to accept
-   transmissions.  Return 0 on success, -1 for errors.  */
-int connect __P ((int __sockfd, __const struct sockaddr *__serv_addr,
-		int __addrlen));
+   one will be chosen automatically.  Returns 0 on success, -1 for errors.  */
+extern int socketpair __P ((int __domain, int __type, int __protocol,
+			    int __fds[2]));
 
-/* Prepare to accept connections on socket FD.
-   N connection requests will be queued before further requests are
-   refused. Returns 0 on success, -1 for errors.  */
-int listen __P ((int __sockfd, int __n));
-
-/* Await a connection on socket FD.
-   When a connection arrives, open a new socket to communicate with it,
-   set *ADDR (which is *ADDR_LEN bytes long) to the address of the
-   connecting peer and *ADDR_LEN to the address's actual length, and
-   return the new socket's descriptor, or -1 for errors.  */
-int accept __P ((int __sockfd, __const struct sockaddr *__peer,
-		int *__paddrlen));
-
-/* Put the current value for socket FD's option OPTNAME at protocol
-   level LEVEL into OPTVAL (which is *OPTLEN bytes long), and set
-   *OPTLEN to the value's actual length. Returns 0 on success, -1 for
-   errors.  */
-int getsockopt __P ((int __s, int __level, int __optname,
-		void *__optval, int *__optlen));
-
-/* Set socket FD's option OPTNAME at protocol level LEVEL
-   to *OPTVAL (which is OPTLEN bytes long).
-   Returns 0 on success, -1 for errors.  */
-int setsockopt __P ((int __s, int __level, int __optname,
-		__const void *__optval, int optlen));
+/* Give the socket FD the local address ADDR (which is LEN bytes long).  */
+extern int bind __P ((int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len));
 
 /* Put the local address of FD into *ADDR and its length in *LEN.  */
-int getsockname __P ((int __sockfd, struct sockaddr *__addr,
-		int *__paddrlen));
+extern int getsockname __P ((int __fd, __SOCKADDR_ARG __addr,
+			     socklen_t *__len));
+
+/* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
+   For connectionless socket types, just set the default address to send to
+   and the only address from which to accept transmissions.
+   Return 0 on success, -1 for errors.  */
+extern int __connect __P ((int __fd,
+			   __CONST_SOCKADDR_ARG __addr, socklen_t __len));
+extern int connect __P ((int __fd,
+			 __CONST_SOCKADDR_ARG __addr, socklen_t __len));
 
 /* Put the address of the peer connected to socket FD into *ADDR
    (which is *LEN bytes long), and its actual length into *LEN.  */
-int getpeername __P ((int __sockfd, struct sockaddr *__peer,
-		int *__paddrlen));
+extern int getpeername __P ((int __fd, __SOCKADDR_ARG __addr,
+			     socklen_t *__len));
+
 
-/* Send N bytes of BUF to socket FD.  Returns the number sent or -1. */
-int send __P ((int __sockfd, __const void *__buff, size_t __len,
-		 unsigned int __flags));
+/* Send N bytes of BUF to socket FD.  Returns the number sent or -1.  */
+extern int __send __P ((int __fd, __const __ptr_t __buf, size_t __n,
+			int __flags));
+extern int send __P ((int __fd, __const __ptr_t __buf, size_t __n,
+		      int __flags));
 
 /* Read N bytes into BUF from socket FD.
    Returns the number read or -1 for errors.  */
-int recv __P ((int __sockfd, void *__buff, size_t __len,
-		 unsigned int __flags));
+extern int recv __P ((int __fd, __ptr_t __buf, size_t __n, int __flags));
 
 /* Send N bytes of BUF on socket FD to peer at address ADDR (which is
-   ADDR_LEN bytes long).  Returns the number sent, or -1 for errors. */
-int sendto __P ((int __sockfd, __const void *__buff, size_t __len,
-		 unsigned int __flags, __const struct sockaddr *__to,
-		 int __tolen));
+   ADDR_LEN bytes long).  Returns the number sent, or -1 for errors.  */
+extern int sendto __P ((int __fd, __const __ptr_t __buf, size_t __n,
+			int __flags, __CONST_SOCKADDR_ARG __addr,
+			socklen_t __addr_len));
 
 /* Read N bytes into BUF through socket FD.
-   If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address
-   of the sender, and store the actual size of the address in
-   *ADDR_LEN. Returns the number of bytes read or -1 for errors. */
-int recvfrom __P ((int __sockfd, void *__buff, size_t __len,
-		 unsigned int __flags, struct sockaddr *__from,
-		 int *__fromlen));
+   If ADDR is not NULL, fill in *ADDR_LEN bytes of it with tha address of
+   the sender, and store the actual size of the address in *ADDR_LEN.
+   Returns the number of bytes read or -1 for errors.  */
+extern int recvfrom __P ((int __fd, __ptr_t __buf, size_t __n, int __flags,
+			  __SOCKADDR_ARG __addr, socklen_t *__addr_len));
+
 
 /* Send a message described MESSAGE on socket FD.
    Returns the number of bytes sent, or -1 for errors.  */
 extern int sendmsg __P ((int __fd, __const struct msghdr *__message,
-			unsigned int __flags));
+			 int __flags));
 
 /* Receive a message as described by MESSAGE from socket FD.
    Returns the number of bytes read or -1 for errors.  */
-extern int recvmsg __P ((int __fd, struct msghdr *__message,
-			unsigned int __flags));
- 
+extern int recvmsg __P ((int __fd, struct msghdr *__message, int __flags));
+
+
+/* Put the current value for socket FD's option OPTNAME at protocol level LEVEL
+   into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the value's
+   actual length.  Returns 0 on success, -1 for errors.  */
+extern int getsockopt __P ((int __fd, int __level, int __optname,
+			    __ptr_t __optval, socklen_t *__optlen));
+
+/* Set socket FD's option OPTNAME at protocol level LEVEL
+   to *OPTVAL (which is OPTLEN bytes long).
+   Returns 0 on success, -1 for errors.  */
+extern int setsockopt __P ((int __fd, int __level, int __optname,
+			    __const __ptr_t __optval, socklen_t __optlen));
+
+
+/* Prepare to accept connections on socket FD.
+   N connection requests will be queued before further requests are refused.
+   Returns 0 on success, -1 for errors.  */
+extern int listen __P ((int __fd, unsigned int __n));
+
+/* Await a connection on socket FD.
+   When a connection arrives, open a new socket to communicate with it,
+   set *ADDR (which is *ADDR_LEN bytes long) to the address of the connecting
+   peer and *ADDR_LEN to the address's actual length, and return the
+   new socket's descriptor, or -1 for errors.  */
+extern int accept __P ((int __fd, __SOCKADDR_ARG __addr,
+			socklen_t *__addr_len));
+
 /* Shut down all or part of the connection open on socket FD.
    HOW determines what to shut down:
-	0 = No more receptions;
-	1 = No more transmissions;
-	2 = No more receptions or transmissions.
+     SHUT_RD   = No more receptions;
+     SHUT_WR   = No more transmissions;
+     SHUT_RDWR = No more receptions or transmissions.
    Returns 0 on success, -1 for errors.  */
-int shutdown __P ((int __sockfd, int __how));
+extern int shutdown __P ((int __fd, int __how));
 
 
-/* belongs here or elsewhere? */
-int rcmd __P ((char **__ahost, unsigned short __inport,
-		__const char *__locuser, __const char *__remuser,
-		__const char *__cmd, int *__fd2p));
-int rresvport __P ((int *__port));
-int ruserok __P ((__const char *__rhost, int __superuser,
-		__const char *__ruser, __const char *__luser));
-int rexec __P ((char **__ahost, int __inport, __const char *__user,
-		 __const char *__passwd, __const char *__cmd,
-		 int *__fd2p));
+/* FDTYPE is S_IFSOCK or another S_IF* macro defined in <sys/stat.h>;
+   returns 1 if FD is open on an object of the indicated type, 0 if not,
+   or -1 for errors (setting errno).  */
+extern int isfdtype __P ((int __fd, int __fdtype));
 
 __END_DECLS
 
-#endif /* _SYS_SOCKET_H */
+#endif /* sys/socket.h */
diff --git a/include/sys/socketvar.h b/include/sys/socketvar.h
index 283356534..b177158d0 100644
--- a/include/sys/socketvar.h
+++ b/include/sys/socketvar.h
@@ -1,8 +1,3 @@
-/*
- *	This seems the best way to handle this. sys/socket.h already has
- *	all the right bits in it. In fact there isn't a single useful thing
- *	in the BSD net-2 sys/socketvar.h anyway but people persist in including
- *	it...
- *		Alan
- */
+/* This header is used on many systems but for GNU we have everything
+   already defined in the standard header.  */
 #include <sys/socket.h>
diff --git a/include/sys/stat.h b/include/sys/stat.h
index e486d755c..13c50411d 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -1,192 +1,368 @@
-#ifndef _SYS_STAT_H
-#define _SYS_STAT_H
+/* Copyright (C) 1991, 92, 95, 96, 97, 98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/*
+ *	POSIX Standard: 5.6 File Characteristics	<sys/stat.h>
+ */
+
+#ifndef	_SYS_STAT_H
+#define	_SYS_STAT_H	1
 
 #include <features.h>
-#include <sys/types.h>
-#undef __NOT_KERNEL
-#define __NOT_KERNEL
-#include <linux/stat.h>
-#undef __NOT_KERNEL
 
-#ifdef __SVR4_I386_ABI_L1__
-#include <sys/time.h>		/* For timestruc_t */
-#endif /* __SVR4_I386_ABI_L1__ */
+#include <bits/types.h>		/* For __mode_t and __dev_t.  */
+
+#ifdef __USE_XOPEN
+# define __need_time_t
+# include <time.h>		/* For time_t.  */
+
+/* The Single Unix specification says that some more types are
+   available here.  */
+# ifndef dev_t
+typedef __dev_t dev_t;
+#  define dev_t dev_t
+# endif
+
+# ifndef gid_t
+typedef __gid_t gid_t;
+#  define gid_t gid_t
+# endif
+
+# ifndef ino_t
+#  ifndef __USE_FILE_OFFSET64
+typedef __ino_t ino_t;
+#  else
+typedef __ino64_t ino_t;
+#  endif
+#  define ino_t ino_t
+# endif
+
+# ifndef mode_t
+typedef __mode_t mode_t;
+#  define mode_t mode_t
+# endif
+
+# ifndef nlink_t
+typedef __nlink_t nlink_t;
+#  define nlink_t nlink_t
+# endif
+
+# ifndef off_t
+#  ifndef __USE_FILE_OFFSET64
+typedef __off_t off_t;
+#  else
+typedef __off64_t off_t;
+#  endif
+#  define off_t off_t
+# endif
+
+# ifndef uid_t
+typedef __uid_t uid_t;
+#  define uid_t uid_t
+# endif
+#endif	/* X/Open */
+
+#ifdef __USE_UNIX98
+# ifndef pid_t
+typedef __pid_t pid_t;
+#  define pid_t pid_t
+# endif
+#endif	/* Unix98 */
 
 __BEGIN_DECLS
 
-struct stat {
-	dev_t		st_dev;
-
-#ifdef __SVR4_I386_ABI_L1__
-	long st_pad1[3];
-#else
-	unsigned short __pad1;
+#include <bits/stat.h>
+
+#if defined __USE_BSD || defined __USE_MISC || defined __USE_XOPEN
+# define S_IFMT		__S_IFMT
+# define S_IFDIR	__S_IFDIR
+# define S_IFCHR	__S_IFCHR
+# define S_IFBLK	__S_IFBLK
+# define S_IFREG	__S_IFREG
+# ifdef __S_IFIFO
+#  define S_IFIFO	__S_IFIFO
+# endif
+# if defined __USE_BSD || defined __USE_MISC
+#  ifdef __S_IFLNK
+#   define S_IFLNK	__S_IFLNK
+#  endif
+#  ifdef __S_IFSOCK
+#   define S_IFSOCK	__S_IFSOCK
+#  endif
+# endif
 #endif
 
-	ino_t		st_ino;
-	umode_t		st_mode;
-	nlink_t		st_nlink;
-	uid_t		st_uid;
-	gid_t		st_gid;
-	dev_t		st_rdev;
+/* Test macros for file types.	*/
 
-#ifdef __SVR4_I386_ABI_L1__
-	long st_pad2[2];
-#else
-	unsigned short __pad2;
+#define	__S_ISTYPE(mode, mask)	(((mode) & __S_IFMT) == (mask))
+
+#define	S_ISDIR(mode)	 __S_ISTYPE((mode), __S_IFDIR)
+#define	S_ISCHR(mode)	 __S_ISTYPE((mode), __S_IFCHR)
+#define	S_ISBLK(mode)	 __S_ISTYPE((mode), __S_IFBLK)
+#define	S_ISREG(mode)	 __S_ISTYPE((mode), __S_IFREG)
+#ifdef __S_IFIFO
+# define S_ISFIFO(mode)	 __S_ISTYPE((mode), __S_IFIFO)
 #endif
 
-	off_t		st_size;
+#ifdef	__USE_BSD
+# ifdef __S_IFLNK
+#  define S_ISLNK(mode)	 __S_ISTYPE((mode), __S_IFLNK)
+# else
+#  define S_ISLNK(mode)  0
+# endif
+# ifdef __S_IFSOCK
+#  define S_ISSOCK(mode) __S_ISTYPE((mode), __S_IFSOCK)
+# endif
+#endif
 
-#ifdef __SVR4_I386_ABI_L1__
-	timestruc_t	st_atim;
-	timestruc_t	st_mtim;
-	timestruc_t	st_ctim;
-    	long		st_blksize;
-    	long		st_blocks;
 
-#define	FSTYPSZ		16
+/* Protection bits.  */
 
-        char            st_fstype[FSTYPSZ];
-        long		st_pad4[8];
+#define	S_ISUID __S_ISUID	/* Set user ID on execution.  */
+#define	S_ISGID	__S_ISGID	/* Set group ID on execution.  */
 
-#define st_atime	st_atim.tv_sec
-#define st_mtime	st_mtim.tv_sec
-#define st_ctime	st_ctim.tv_sec
+#if defined __USE_BSD || defined __USE_MISC
+/* Save swapped text after use (sticky bit).  This is pretty well obsolete.  */
+# define S_ISVTX	__S_ISVTX
+#endif
 
-#else /*! __SVR4_I386_ABI_L1__*/
-	unsigned long	st_blksize;
-	unsigned long	st_blocks;
-	time_t		st_atime;
-	unsigned long	__unused1;
-	time_t		st_mtime;
-	unsigned long	__unused2;
-	time_t		st_ctime;
-	unsigned long	__unused3;
-	unsigned long	__unused4;
-	unsigned long	__unused5;
-#endif /*! __SVR4_I386_ABI_L1__*/
-};
+#define	S_IRUSR	__S_IREAD	/* Read by owner.  */
+#define	S_IWUSR	__S_IWRITE	/* Write by owner.  */
+#define	S_IXUSR	__S_IEXEC	/* Execute by owner.  */
+/* Read, write, and execute by owner.  */
+#define	S_IRWXU	(__S_IREAD|__S_IWRITE|__S_IEXEC)
 
+#if defined __USE_MISC && defined __USE_BSD
+# define S_IREAD	S_IRUSR
+# define S_IWRITE	S_IWUSR
+# define S_IEXEC	S_IXUSR
+#endif
 
-#define LINUX_MKNOD_VERSION 1     /* SVr4 */
-#define LINUX_STAT_VERSION 1      /* SVr4 */
+#define	S_IRGRP	(S_IRUSR >> 3)	/* Read by group.  */
+#define	S_IWGRP	(S_IWUSR >> 3)	/* Write by group.  */
+#define	S_IXGRP	(S_IXUSR >> 3)	/* Execute by group.  */
+/* Read, write, and execute by group.  */
+#define	S_IRWXG	(S_IRWXU >> 3)
 
-extern int _fxstat __P ((int __ver, int __fildes,
-			struct stat *__stat_buf));
+#define	S_IROTH	(S_IRGRP >> 3)	/* Read by others.  */
+#define	S_IWOTH	(S_IWGRP >> 3)	/* Write by others.  */
+#define	S_IXOTH	(S_IXGRP >> 3)	/* Execute by others.  */
+/* Read, write, and execute by others.  */
+#define	S_IRWXO	(S_IRWXG >> 3)
 
-extern int _xstat __P ((int __ver, __const char *__filename,
-			struct stat *__stat_buf));
 
-extern int _lxstat __P ((int __ver, __const char *__filename,
-			struct stat *__stat_buf));
+#ifdef	__USE_BSD
+/* Macros for common mode bit masks.  */
+# define ACCESSPERMS (S_IRWXU|S_IRWXG|S_IRWXO) /* 0777 */
+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
+# define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)/* 0666*/
 
-#ifdef _MIT_POSIX_THREADS
-extern int __machdep_sys__fxstat __P ((int __ver, int __fd,
-			struct stat *__stat_buf));
+# define S_BLKSIZE	512	/* Block size for `st_blocks'.  */
 #endif
 
-extern int _xmknod __P ((int __ver, __const char *__path,
-			mode_t __mode, dev_t *__dev));
-
-/* Some synonyms used historically in the kernel and elsewhere */
-#define S_IREAD		S_IRUSR /* read permission, owner */
-#define S_IWRITE	S_IWUSR /* write permission, owner */
-#define S_IEXEC		S_IXUSR /* execute/search permission, owner */
 
-extern int	__chmod __P ((__const char *__path, mode_t __mode));
-extern int	chmod __P ((__const char *__path, mode_t __mode));
+#ifndef __USE_FILE_OFFSET64
+/* Get file attributes for FILE and put them in BUF.  */
+extern int stat __P ((__const char *__file, struct stat *__buf));
 
-extern int	__fchmod __P ((int __fildes, mode_t __mode));
-extern int	fchmod __P ((int __fildes, mode_t __mode));
+/* Get file attributes for the file, device, pipe, or socket
+   that file descriptor FD is open on and put them in BUF.  */
+extern int fstat __P ((int __fd, struct stat *__buf));
+#else
+# ifdef __REDIRECT
+extern int __REDIRECT (stat, __P ((__const char *__file, struct stat *__buf)),
+		       stat64);
+extern int __REDIRECT (fstat, __P ((int __fd, struct stat *__buf)), fstat64);
+# else
+#  define stat stat64
+#  define fstat fstat64
+# endif
+#endif
+#ifdef __USE_LARGEFILE64
+extern int stat64 __P ((__const char *__file, struct stat64 *__buf));
+extern int fstat64 __P ((int __fd, struct stat64 *__buf));
+#endif
 
-extern int	__mkdir __P ((__const char *__path, mode_t __mode));
-extern int	mkdir __P ((__const char *__path, mode_t __mode));
+#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+# ifndef __USE_FILE_OFFSET64
+/* Get file attributes about FILE and put them in BUF.
+   If FILE is a symbolic link, do not follow it.  */
+extern int lstat __P ((__const char *__file, struct stat *__buf));
+# else
+#  ifdef __REDIRECT
+extern int __REDIRECT (lstat, __P ((__const char *__file, struct stat *__buf)),
+		       lstat64);
+#  else
+#   define lstat lstat64
+#  endif
+# endif
+# ifdef __USE_LARGEFILE64
+extern int lstat64 __P ((__const char *__file, struct stat64 *__buf));
+# endif
+#endif
 
-extern int	mkfifo __P ((__const char *__path, mode_t __mode));
+/* Set file access permissions for FILE to MODE.
+   This takes an `int' MODE argument because that
+   is what `mode_t's get widened to.  */
+extern int chmod __P ((__const char *__file, __mode_t __mode));
 
-#if 1
+/* Set file access permissions of the file FD is open on to MODE.  */
+#if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+extern int fchmod __P ((int __fd, __mode_t __mode));
+#endif
 
-extern int	__fstat __P ((int __fildes, struct stat *__stat_buf));
-extern int	fstat __P ((int __fildes, struct stat *__stat_buf));
 
-extern int	__stat __P ((__const char *__filename,
-			struct stat *__stat_buf));
-extern int	stat __P ((__const char *__filename,
-			struct stat *__stat_buf));
+/* Set the file creation mask of the current process to MASK,
+   and return the old creation mask.  */
+extern __mode_t umask __P ((__mode_t __mask));
 
-extern int	__lstat __P ((__const char *__filename,
-			struct stat *__stat_buf));
-extern int	lstat __P ((__const char *__filename,
-			struct stat *__stat_buf));
+#ifdef	__USE_GNU
+/* Get the current `umask' value without changing it.
+   This function is only available under the GNU Hurd.  */
+extern __mode_t getumask __P ((void));
+#endif
 
-extern int	__mknod __P ((__const char *__path, mode_t __mode,
-			dev_t __dev));
-extern int	mknod __P ((__const char *__path, mode_t __mode,
-			dev_t __dev));
-#endif		/* #if 0 */
+/* Create a new directory named PATH, with permission bits MODE.  */
+extern int mkdir __P ((__const char *__path, __mode_t __mode));
 
-extern mode_t	__umask __P ((mode_t __mask));
-extern mode_t	umask __P ((mode_t __mask));
+/* Create a device file named PATH, with permission and special bits MODE
+   and device number DEV (which can be constructed from major and minor
+   device numbers with the `makedev' macro above).  */
+#if defined __USE_MISC || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+extern int mknod __P ((__const char *__path,
+		       __mode_t __mode, __dev_t __dev));
+#endif
 
-__END_DECLS
 
-#if 0
+/* Create a new FIFO named PATH, with permission bits MODE.  */
+extern int mkfifo __P ((__const char *__path, __mode_t __mode));
+
+/* To allow the `struct stat' structure and the file type `mode_t'
+   bits to vary without changing shared library major version number,
+   the `stat' family of functions and `mknod' are in fact inline
+   wrappers around calls to `xstat', `fxstat', `lxstat', and `xmknod',
+   which all take a leading version-number argument designating the
+   data structure and bits used.  <bits/stat.h> defines _STAT_VER with
+   the version number corresponding to `struct stat' as defined in
+   that file; and _MKNOD_VER with the version number corresponding to
+   the S_IF* macros defined therein.  It is arranged that when not
+   inlined these function are always statically linked; that way a
+   dynamically-linked executable always encodes the version number
+   corresponding to the data structures it uses, so the `x' functions
+   in the shared library can adapt without needing to recompile all
+   callers.  */
+
+#ifndef _STAT_VER
+# define _STAT_VER	0
+#endif
+#ifndef _MKNOD_VER
+# define _MKNOD_VER	0
+#endif
 
-static __inline__ int __stat(__const char * __path, struct stat * __statbuf)
-{
-  return _xstat(LINUX_STAT_VERSION, __path, __statbuf);
-}
+/* Wrappers for stat and mknod system calls.  */
+#ifndef __USE_FILE_OFFSET64
+extern int __fxstat __P ((int __ver, int __fildes,
+			  struct stat *__stat_buf));
+extern int __xstat __P ((int __ver, __const char *__filename,
+			 struct stat *__stat_buf));
+extern int __lxstat __P ((int __ver, __const char *__filename,
+			  struct stat *__stat_buf));
+#else
+# ifdef __REDIRECT
+extern int __REDIRECT (__fxstat, __P ((int __ver, int __fildes,
+				       struct stat *__stat_buf)), __fxstat64);
+extern int __REDIRECT (__xstat, __P ((int __ver, __const char *__filename,
+				      struct stat *__stat_buf)), __xstat64);
+extern int __REDIRECT (__lxstat, __P ((int __ver, __const char *__filename,
+				       struct stat *__stat_buf)), __lxstat64);
+
+# else
+#  define __fxstat __fxstat64
+#  define __xstat __xstat64
+#  define __lxstat __lxstat64
+# endif
+#endif
 
-static __inline__ int stat(__const char * __path, struct stat * __statbuf)
-{
-  return _xstat(LINUX_STAT_VERSION, __path, __statbuf);
-}
+#ifdef __USE_LARGEFILE64
+extern int __fxstat64 __P ((int __ver, int __fildes,
+			    struct stat64 *__stat_buf));
+extern int __xstat64 __P ((int __ver, __const char *__filename,
+			   struct stat64 *__stat_buf));
+extern int __lxstat64 __P ((int __ver, __const char *__filename,
+			    struct stat64 *__stat_buf));
+#endif
+extern int __xmknod __P ((int __ver, __const char *__path,
+			  __mode_t __mode, __dev_t *__dev));
 
-static __inline__ int __lstat(__const char * __path, struct stat * __statbuf)
-{
-  return _lxstat(LINUX_STAT_VERSION, __path, __statbuf);
-}
+#if defined __GNUC__ && __GNUC__ >= 2
+/* Inlined versions of the real stat and mknod functions.  */
 
-static __inline__ int lstat(__const char * __path, struct stat * __statbuf)
+extern __inline__ int stat (__const char *__path,
+			    struct stat *__statbuf) 
 {
-  return _lxstat(LINUX_STAT_VERSION, __path, __statbuf);
+  return __xstat (_STAT_VER, __path, __statbuf);
 }
 
-static __inline__ int __fstat(int __fd, struct stat * __statbuf)
+# if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+extern __inline__ int lstat (__const char *__path,
+			     struct stat *__statbuf) 
 {
-  return _fxstat(LINUX_STAT_VERSION, __fd, __statbuf);
+  return __lxstat (_STAT_VER, __path, __statbuf);
 }
+# endif
 
-static __inline__ int fstat(int __fd, struct stat * __statbuf)
+extern __inline__ int fstat (int __fd, struct stat *__statbuf) 
 {
-  return _fxstat(LINUX_STAT_VERSION, __fd, __statbuf);
+  return __fxstat (_STAT_VER, __fd, __statbuf);
 }
 
-static __inline__ int __mknod(__const char * __path, mode_t __mode, dev_t __dev)
+# if defined __USE_MISC || defined __USE_BSD
+extern __inline__ int mknod (__const char *__path, __mode_t __mode,
+			     __dev_t __dev) 
 {
-  return _xmknod(LINUX_MKNOD_VERSION, __path, __mode, &__dev);
+  return __xmknod (_MKNOD_VER, __path, __mode, &__dev);
 }
+# endif
 
-static __inline__ int mknod(__const char * __path, mode_t __mode, dev_t __dev)
+# ifdef __USE_LARGEFILE64
+extern __inline__ int stat64 (__const char *__path,
+			      struct stat64 *__statbuf) 
 {
-  return _xmknod(LINUX_MKNOD_VERSION, __path, __mode, &__dev);
+  return __xstat64 (_STAT_VER, __path, __statbuf);
 }
 
-#ifdef _MIT_POSIX_THREADS
-
-static __inline__ int __machdep_sys_fstat(int __fd, struct stat * __statbuf)
+#  if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
+extern __inline__ int lstat64 (__const char *__path,
+			       struct stat64 *__statbuf) 
 {
-  return __machdep_sys__fxstat(LINUX_STAT_VERSION, __fd, __statbuf);
+  return __lxstat64 (_STAT_VER, __path, __statbuf);
 }
+#  endif
 
-static __inline__ int machdep_sys_fstat(int __fd, struct stat * __statbuf)
+extern __inline__ int fstat64 (int __fd, struct stat64 *__statbuf) 
 {
-  return __machdep_sys__fxstat(LINUX_STAT_VERSION, __fd, __statbuf);
+  return __fxstat64 (_STAT_VER, __fd, __statbuf);
 }
+# endif
 
 #endif
 
-#endif
+__END_DECLS
 
-#endif
+
+#endif /* sys/stat.h  */
diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
new file mode 100644
index 000000000..35760e5e0
--- /dev/null
+++ b/include/sys/sysmacros.h
@@ -0,0 +1,49 @@
+/* Definitions of macros to access `dev_t' values.
+   Copyright (C) 1996, 1997, 1999 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef _SYS_SYSMACROS_H
+#define _SYS_SYSMACROS_H	1
+
+/* For compatibility we provide alternative names.
+
+   The problem here is that compilers other than GCC probably don't
+   have the `long long' type and so `dev_t' is actually an array.  */
+#if defined __GNUC__ && __GNUC__ >= 2
+# define major(dev) ((int)(((dev) >> 8) & 0xff))
+# define minor(dev) ((int)((dev) & 0xff))
+# define makedev(major, minor) ((((unsigned int) (major)) << 8) \
+				| ((unsigned int) (minor)))
+#else
+/* We need to know the word order here.  This assumes that the word order
+   is consistent with the byte order.  */
+# include <endian.h>
+# if __BYTE_ORDER == __BIG_ENDIAN
+#  define major(dev) (((dev).__val[1] >> 8) & 0xff)
+#  define minor(dev) ((dev).__val[1] & 0xff)
+#  define makedev(major, minor) { 0, ((((unsigned int) (major)) << 8) \
+				      | ((unsigned int) (minor))) }
+# else
+#  define major(dev) (((dev).__val[0] >> 8) & 0xff)
+#  define minor(dev) ((dev).__val[0] & 0xff)
+#  define makedev(major, minor) { ((((unsigned int) (major)) << 8) \
+				   | ((unsigned int) (minor))), 0 }
+# endif
+#endif
+
+#endif /* sys/sysmacros.h */
diff --git a/include/sys/time.h b/include/sys/time.h
index 98e51c07c..83be23fb4 100644
--- a/include/sys/time.h
+++ b/include/sys/time.h
@@ -1,81 +1,145 @@
+/* Copyright (C) 1991, 92, 93, 94, 96, 97, 98 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
 #ifndef _SYS_TIME_H
-#define _SYS_TIME_H
+#define _SYS_TIME_H	1
 
 #include <features.h>
-#include <linux/types.h>
-#include <linux/time.h>
-
-#define	DST_NONE	0	/* not on dst */
-#define	DST_USA		1	/* USA style dst */
-#define	DST_AUST	2	/* Australian style dst */
-#define	DST_WET		3	/* Western European dst */
-#define	DST_MET		4	/* Middle European dst */
-#define	DST_EET		5	/* Eastern European dst */
-#define	DST_CAN		6	/* Canada */
-#define	DST_GB		7	/* Great Britain and Eire */
-#define	DST_RUM		8	/* Rumania */
-#define	DST_TUR		9	/* Turkey */
-#define	DST_AUSTALT	10	/* Australian style with shift in 1986 */
-
-#ifdef __SVR4_I386_ABI_L1__
-typedef struct timestruc {
-    time_t tv_sec;
-    long   tv_nsec;
-} timestruc_t;
-#endif /* __SVR4_I386_ABI_L1__ */
-
-/*
- * Operations on timevals.
- *
- * NB: timercmp does not work for >= or <=.
- * 
- */
-#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
-#define	timercmp(tvp, uvp, cmp)	\
-	(((tvp)->tv_sec == (uvp)->tv_sec && (tvp)->tv_usec cmp (uvp)->tv_usec) \
-	|| (tvp)->tv_sec cmp (uvp)->tv_sec)
-#define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
 
 #include <time.h>
-#include <sys/types.h>
+#include <sys/select.h>
+
+#define __need_timeval
+#include <bits/time.h>
+
 
 __BEGIN_DECLS
 
-extern int	__gettimeofday __P ((struct timeval * __tp,
-			struct timezone * __tz));
-extern int	gettimeofday __P ((struct timeval * __tp,
-			struct timezone * __tz));
-extern int	__settimeofday __P ((__const struct timeval *__tv,
-			__const struct timezone *__tz));
-extern int	settimeofday __P ((__const struct timeval *__tv,
-			__const struct timezone *__tz));
-
-extern int	__select __P ((int __width, fd_set * __readfds,
-			fd_set * __writefds, fd_set * __exceptfds,
-			struct timeval * __timeout));
-extern int	select __P ((int __width, fd_set * __readfds,
-			fd_set * __writefds, fd_set * __exceptfds,
-			struct timeval * __timeout));
-
-extern int	__getitimer __P ((int __which,
-			struct itimerval *__value));
-extern int	getitimer __P ((int __which,
-			struct itimerval *__value));
-extern int	__setitimer __P ((int __which,
-			__const struct itimerval *__value,
-			struct itimerval *__ovalue));
-extern int	setitimer __P ((int __which,
-			__const struct itimerval *__value,
-			struct itimerval *__ovalue));
-
-extern int	__adjtime __P ((struct timeval * __itv,
-			struct timeval * __otv));
-extern int	adjtime __P ((struct timeval * __itv,
-			struct timeval * __otv));
-
-extern int	__utimes __P((char *__path, struct timeval *tvp));
-extern int	utimes __P((char *__path, struct timeval *tvp));
+/* Macros for converting between `struct timeval' and `struct timespec'.  */
+#define TIMEVAL_TO_TIMESPEC(tv, ts) {                                   \
+        (ts)->tv_sec = (tv)->tv_sec;                                    \
+        (ts)->tv_nsec = (tv)->tv_usec * 1000;                           \
+}
+#define TIMESPEC_TO_TIMEVAL(tv, ts) {                                   \
+        (tv)->tv_sec = (ts)->tv_sec;                                    \
+        (tv)->tv_usec = (ts)->tv_nsec / 1000;                           \
+}
+
+
+/* Structure crudely representing a timezone.
+   This is obsolete and should never be used.  */
+struct timezone
+  {
+    int tz_minuteswest;		/* Minutes west of GMT.  */
+    int tz_dsttime;		/* Nonzero if DST is ever in effect.  */
+  };
+
+/* Get the current time of day and timezone information,
+   putting it into *TV and *TZ.  If TZ is NULL, *TZ is not filled.
+   Returns 0 on success, -1 on errors.
+   NOTE: This form of timezone information is obsolete.
+   Use the functions and variables declared in <time.h> instead.  */
+extern int gettimeofday __P ((struct timeval *__tv,
+			      struct timezone *__tz));
+
+/* Set the current time of day and timezone information.
+   This call is restricted to the super-user.  */
+extern int settimeofday __P ((__const struct timeval *__tv,
+			      __const struct timezone *__tz));
+
+/* Adjust the current time of day by the amount in DELTA.
+   If OLDDELTA is not NULL, it is filled in with the amount
+   of time adjustment remaining to be done from the last `adjtime' call.
+   This call is restricted to the super-user.  */
+extern int adjtime __P ((__const struct timeval *__delta,
+			 struct timeval *__olddelta));
+
+
+/* Values for the first argument to `getitimer' and `setitimer'.  */
+enum __itimer_which
+  {
+    /* Timers run in real time.  */
+    ITIMER_REAL = 0,
+#define ITIMER_REAL ITIMER_REAL
+    /* Timers run only when the process is executing.  */
+    ITIMER_VIRTUAL = 1,
+#define ITIMER_VIRTUAL ITIMER_VIRTUAL
+    /* Timers run when the process is executing and when
+       the system is executing on behalf of the process.  */
+    ITIMER_PROF = 2
+#define ITIMER_PROF ITIMER_PROF
+  };
+
+/* Type of the second argument to `getitimer' and
+   the second and third arguments `setitimer'.  */
+struct itimerval
+  {
+    /* Value to put into `it_value' when the timer expires.  */
+    struct timeval it_interval;
+    /* Time to the next timer expiration.  */
+    struct timeval it_value;
+  };
+
+/* Set *VALUE to the current setting of timer WHICH.
+   Return 0 on success, -1 on errors.  */
+extern int getitimer __P ((enum __itimer_which __which,
+			   struct itimerval *__value));
+
+/* Set the timer WHICH to *NEW.  If OLD is not NULL,
+   set *OLD to the old value of timer WHICH.
+   Returns 0 on success, -1 on errors.  */
+extern int setitimer __P ((enum __itimer_which __which,
+			   __const struct itimerval *__new,
+			   struct itimerval *__old));
+
+/* Change the access time of FILE to TVP[0] and
+   the modification time of FILE to TVP[1].  */
+extern int utimes __P ((__const char *__file, struct timeval __tvp[2]));
+
+
+/* Convenience macros for operations on timevals.
+   NOTE: `timercmp' does not work for >= or <=.  */
+#define	timerisset(tvp)		((tvp)->tv_sec || (tvp)->tv_usec)
+#define	timerclear(tvp)		((tvp)->tv_sec = (tvp)->tv_usec = 0)
+#define	timercmp(a, b, CMP) 						      \
+  (((a)->tv_sec == (b)->tv_sec) ? 					      \
+   ((a)->tv_usec CMP (b)->tv_usec) : 					      \
+   ((a)->tv_sec CMP (b)->tv_sec))
+#define	timeradd(a, b, result)						      \
+  do {									      \
+    (result)->tv_sec = (a)->tv_sec + (b)->tv_sec;			      \
+    (result)->tv_usec = (a)->tv_usec + (b)->tv_usec;			      \
+    if ((result)->tv_usec >= 1000000)					      \
+      {									      \
+	++(result)->tv_sec;						      \
+	(result)->tv_usec -= 1000000;					      \
+      }									      \
+  } while (0)
+#define	timersub(a, b, result)						      \
+  do {									      \
+    (result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			      \
+    (result)->tv_usec = (a)->tv_usec - (b)->tv_usec;			      \
+    if ((result)->tv_usec < 0) {					      \
+      --(result)->tv_sec;						      \
+      (result)->tv_usec += 1000000;					      \
+    }									      \
+  } while (0)
 
 __END_DECLS
 
-#endif /*_SYS_TIME_H*/
+#endif /* sys/time.h */
diff --git a/include/sys/ttydefaults.h b/include/sys/ttydefaults.h
new file mode 100644
index 000000000..b21c6d568
--- /dev/null
+++ b/include/sys/ttydefaults.h
@@ -0,0 +1,104 @@
+/*-
+ * Copyright (c) 1982, 1986, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
+ *
+ * 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. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. 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.
+ *
+ *	@(#)ttydefaults.h	8.4 (Berkeley) 1/21/94
+ */
+
+/*
+ * System wide defaults for terminal state.  Linux version.
+ */
+#ifndef _SYS_TTYDEFAULTS_H_
+#define	_SYS_TTYDEFAULTS_H_
+
+/*
+ * Defaults on "first" open.
+ */
+#define	TTYDEF_IFLAG	(BRKINT | ISTRIP | ICRNL | IMAXBEL | IXON | IXANY)
+#define TTYDEF_OFLAG	(OPOST | ONLCR | XTABS)
+#define TTYDEF_LFLAG	(ECHO | ICANON | ISIG | IEXTEN | ECHOE|ECHOKE|ECHOCTL)
+#define TTYDEF_CFLAG	(CREAD | CS7 | PARENB | HUPCL)
+#define TTYDEF_SPEED	(B9600)
+
+/*
+ * Control Character Defaults
+ */
+#define CTRL(x)	(x&037)
+#define	CEOF		CTRL('d')
+#ifdef _POSIX_VDISABLE
+# define CEOL		_POSIX_VDISABLE
+#else
+# define CEOL		'\0'		/* XXX avoid _POSIX_VDISABLE */
+#endif
+#define	CERASE		0177
+#define	CINTR		CTRL('c')
+#ifdef _POSIX_VDISABLE
+# define CSTATUS	_POSIX_VDISABLE
+#else
+# define CSTATUS	'\0'		/* XXX avoid _POSIX_VDISABLE */
+#endif
+#define	CKILL		CTRL('u')
+#define	CMIN		1
+#define	CQUIT		034		/* FS, ^\ */
+#define	CSUSP		CTRL('z')
+#define	CTIME		0
+#define	CDSUSP		CTRL('y')
+#define	CSTART		CTRL('q')
+#define	CSTOP		CTRL('s')
+#define	CLNEXT		CTRL('v')
+#define	CDISCARD 	CTRL('o')
+#define	CWERASE 	CTRL('w')
+#define	CREPRINT 	CTRL('r')
+#define	CEOT		CEOF
+/* compat */
+#define	CBRK		CEOL
+#define CRPRNT		CREPRINT
+#define	CFLUSH		CDISCARD
+
+/* PROTECTED INCLUSION ENDS HERE */
+#endif /* !_SYS_TTYDEFAULTS_H_ */
+
+/*
+ * #define TTYDEFCHARS to include an array of default control characters.
+ */
+#ifdef TTYDEFCHARS
+cc_t	ttydefchars[NCCS] = {
+	CEOF,	CEOL,	CEOL,	CERASE, CWERASE, CKILL, CREPRINT,
+	_POSIX_VDISABLE, CINTR,	CQUIT,	CSUSP,	CDSUSP,	CSTART,	CSTOP,	CLNEXT,
+	CDISCARD, CMIN,	CTIME,  CSTATUS, _POSIX_VDISABLE
+};
+#undef TTYDEFCHARS
+#endif
diff --git a/include/sys/types.h b/include/sys/types.h
index 4a5cdfab6..2aec0f698 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -1,4 +1,220 @@
+/* Copyright (C) 1991,92,94,95,96,97,98,99, 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/*
+ *	POSIX Standard: 2.6 Primitive System Data Types	<sys/types.h>
+ */
+
+#ifndef	_SYS_TYPES_H
+#define	_SYS_TYPES_H	1
+
+#include <features.h>
+
+__BEGIN_DECLS
+
+#include <bits/types.h>
+
+#ifdef	__USE_BSD
+typedef __u_char u_char;
+typedef __u_short u_short;
+typedef __u_int u_int;
+typedef __u_long u_long;
+typedef __quad_t quad_t;
+typedef __u_quad_t u_quad_t;
+typedef __fsid_t fsid_t;
+#endif
+
+typedef __loff_t loff_t;
+
+#ifndef ino_t
+# ifndef __USE_FILE_OFFSET64
+typedef __ino_t ino_t;
+# else
+typedef __ino64_t ino_t;
+# endif
+# define ino_t ino_t
+#endif
+#if defined __USE_LARGEFILE64 && !defined ino64_t
+typedef __ino64_t ino64_t;
+# define ino64_t ino64_t
+#endif
+
+#ifndef dev_t
+typedef __dev_t dev_t;
+# define dev_t dev_t
+#endif
+
+#ifndef gid_t
+typedef __gid_t gid_t;
+# define gid_t gid_t
+#endif
+
+#ifndef mode_t
+typedef __mode_t mode_t;
+# define mode_t mode_t
+#endif
+
+#ifndef nlink_t
+typedef __nlink_t nlink_t;
+# define nlink_t nlink_t
+#endif
+
+#ifndef uid_t
+typedef __uid_t uid_t;
+# define uid_t uid_t
+#endif
+
+#ifndef off_t
+# ifndef __USE_FILE_OFFSET64
+typedef __off_t off_t;
+# else
+typedef __off64_t off_t;
+# endif
+# define off_t off_t
+#endif
+#if defined __USE_LARGEFILE64 && !defined off64_t
+typedef __off64_t off64_t;
+# define off64_t off64_t
+#endif
+
+#ifndef pid_t
+typedef __pid_t pid_t;
+# define pid_t pid_t
+#endif
+
+#if defined __USE_SVID || defined __USE_XOPEN
+typedef __id_t id_t;
+#endif
+
+#ifndef ssize_t
+typedef __ssize_t ssize_t;
+# define ssize_t ssize_t
+#endif
+
+#ifdef	__USE_BSD
+typedef __daddr_t daddr_t;
+typedef __caddr_t caddr_t;
+#endif
+
+#if defined __USE_SVID || defined __USE_XOPEN
+typedef __key_t key_t;
+#endif
+
+#ifdef __USE_XOPEN
+# define __need_clock_t
+#endif
+#define	__need_time_t
+#include <time.h>
+
+#define	__need_size_t
 #include <stddef.h>
-#include <sys/bitypes.h>
-#include <linux/types.h>
-#include <gnu/types.h>
+
+#ifdef __USE_MISC
+/* Old compatibility names for C types.  */
+typedef unsigned long int ulong;
+typedef unsigned short int ushort;
+typedef unsigned int uint;
+#endif
+
+/* These size-specific names are used by some of the inet code.  */
+
+#if !defined __GNUC__ || __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 7)
+
+/* These types are defined by the ISO C 9x header <inttypes.h>. */
+# ifndef __int8_t_defined
+#  define __int8_t_defined
+typedef	char int8_t;
+typedef	short int int16_t;
+typedef	int int32_t;
+#  ifdef __GNUC__
+__extension__ typedef long long int int64_t;
+#  endif
+# endif
+
+/* But these were defined by ISO C without the first `_'.  */
+typedef	unsigned char u_int8_t;
+typedef	unsigned short int u_int16_t;
+typedef	unsigned int u_int32_t;
+# ifdef __GNUC__
+__extension__ typedef unsigned long long int u_int64_t;
+# endif
+
+typedef int register_t;
+
+#else
+
+/* For GCC 2.7 and later, we can use specific type-size attributes.  */
+# define __intN_t(N, MODE) \
+  typedef int int##N##_t __attribute__ ((__mode__ (MODE)))
+# define __u_intN_t(N, MODE) \
+  typedef unsigned int u_int##N##_t __attribute__ ((__mode__ (MODE)))
+
+# ifndef __int8_t_defined
+#  define __int8_t_defined
+__intN_t (8, __QI__);
+__intN_t (16, __HI__);
+__intN_t (32, __SI__);
+__intN_t (64, __DI__);
+# endif
+
+__u_intN_t (8, __QI__);
+__u_intN_t (16, __HI__);
+__u_intN_t (32, __SI__);
+__u_intN_t (64, __DI__);
+
+typedef int register_t __attribute__ ((__mode__ (__word__)));
+
+
+/* Some code from BIND tests this macro to see if the types above are
+   defined.  */
+#endif
+#define __BIT_TYPES_DEFINED__	1
+
+
+#ifdef	__USE_BSD
+/* In BSD <sys/types.h> is expected to define BYTE_ORDER.  */
+# include <endian.h>
+
+/* It also defines `fd_set' and the FD_* macros for `select'.  */
+# include <sys/select.h>
+
+/* BSD defines these symbols, so we follow.  */
+# include <sys/sysmacros.h>
+#endif /* Use BSD.  */
+
+
+/* Types from the Large File Support interface.  */
+#ifndef __USE_FILE_OFFSET64
+typedef __blkcnt_t blkcnt_t;	 /* Type to count number of disk blocks.  */
+typedef __fsblkcnt_t fsblkcnt_t; /* Type to count file system blocks.  */
+typedef __fsfilcnt_t fsfilcnt_t; /* Type to count file system inodes.  */
+#else
+typedef __blkcnt64_t blkcnt_t;	   /* Type to count number of disk blocks.  */
+typedef __fsblkcnt64_t fsblkcnt_t; /* Type to count file system blocks.  */
+typedef __fsfilcnt64_t fsfilcnt_t; /* Type to count file system inodes.  */
+#endif
+
+#ifdef __USE_LARGEFILE64
+typedef __blkcnt64_t blkcnt64_t;     /* Type to count number of disk blocks. */
+typedef __fsblkcnt64_t fsblkcnt64_t; /* Type to count file system blocks.  */
+typedef __fsfilcnt64_t fsfilcnt64_t; /* Type to count file system inodes.  */
+#endif
+
+__END_DECLS
+
+#endif /* sys/types.h */
diff --git a/include/sys/wait.h b/include/sys/wait.h
index 14c237307..be95c2202 100644
--- a/include/sys/wait.h
+++ b/include/sys/wait.h
@@ -28,7 +28,7 @@ Cambridge, MA 02139, USA.  */
 
 __BEGIN_DECLS
 
-#include <gnu/types.h>
+#include <sys/types.h>
 
 /* This will define the `W*' macros for the flag
    bits to `waitpid', `wait3', and `wait4'.  */