Some more major updates to further superate ucLibc from the kernel

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

1 files changed, 166 insertions, 95 deletions

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 */