Changeset 183 for trunk/src/emx/include/netdb.h

Timestamp:

May 19, 2003, 4:41:00 AM (22 years ago)

Author:

bird

Message:

#434: Initial tcpip header merges.

File:

• trunk/src/emx/include/netdb.h (modified) (9 diffs, 1 prop)

trunk/src/emx/include/netdb.h

@@ -1 +1 @@
 /*- Modified for emx by hv and em 1994-1997
+ *- Modified for gcc by bird 2003
  *
  * Copyright (c) 1980, 1983, 1988 Regents of the University of California.
@@ -33 +34 @@
  *
  *      from: @(#)netdb.h       5.15 (Berkeley) 4/3/91
- *      netdb.h,v 1.1 2003/04/16 15:53:07 bird Exp
+ *      netdb.h,v 1.2 2003/05/19 02:41:00 bird Exp
  */
 
 #ifndef _NETDB_H_
 #define _NETDB_H_
+#ifdef TCPV40HDRS
+#define __NETDB_32H
+#endif
 
 #if defined (__cplusplus)
 extern "C" {
 #endif
+
+/* toolkit compatibility - start */
+#include <sys/param.h>
+#include <sys/cdefs.h>
+/* toolkit compatibility - end */
 
 #ifndef _EMX_TCPIP
@@ -54 +63 @@
 #endif
 
-extern int h_errno;
-
-#define _PATH_HEQUIV    "/tcpip/etc/hosts.equiv"
-#define _PATH_HOSTS     "/tcpip/etc/hosts"
-#define _PATH_NETWORKS  "/tcpip/etc/networks"
-#define _PATH_PROTOCOLS "/tcpip/etc/protocols"
-#define _PATH_SERVICES  "/tcpip/etc/services"
+
+#define _PATH_HEQUIV    "/mptn/etc/hosts.equiv"
+#define _PATH_HOSTS     "/mptn/etc/hosts"
+#define _PATH_NETWORKS  "/mptn/etc/networks"
+#define _PATH_PROTOCOLS "/mptn/etc/protocols"
+#define _PATH_SERVICES  "/mptn/etc/services"
+
+#ifdef TCPV40HDRS
+#define h_errno         (tcp_h_errno())   /* __MT__ safe */
+#else
+#define h_errno         (*tcp_h_errno1()) /* __MT__ safe */
+#endif
 
 /*
@@ -104 +118 @@
  * (left in extern int h_errno).
  */
-#if 0
-#define h_errno (tcp_h_errno()) /* thread safe */
+#ifndef TCPV40HDRS
+#define NETDB_INTERNAL  -1      /* see errno */
+#define NETDB_SUCCESS   0       /* no problem */
 #endif
 #define HOST_NOT_FOUND  1 /* Authoritative Answer Host not found */
@@ -113 +128 @@
 #define NO_ADDRESS      NO_DATA         /* no address, look for MX record */
 
-int             gethostname (char *, int);
-void            endhostent (void);
-void            endnetent (void);
-void            endprotoent (void);
-void            endservent (void);
-struct hostent  *gethostbyaddr (__const__ char *, int, int);
-struct hostent  *gethostbyname (__const__ char *);
-struct hostent  *gethostent (void);
-struct netent   *getnetbyaddr (u_long, int);
-struct netent   *getnetbyname (__const__ char *);
-struct netent   *getnetent (void);
-struct protoent *getprotobyname (__const__ char *);
-struct protoent *getprotobynumber (int);
-struct protoent *getprotoent (void);
-struct servent  *getservbyname (__const__ char *, __const__ char *);
-struct servent  *getservbyport (int, __const__ char *);
-struct servent  *getservent (void);
-void            herror (__const__ char *);
-void            sethostent (int);
-void            setnetent (int);
-void            setprotoent (int);
-void            setservent (int);
-
-#ifdef NETDB_IBM_ADDENDUM
+
+#ifdef TCPV40HDRS
+#include <stdio.h>
+#include <string.h>
+#include <netinet\in.h>
 
 /* IBM addendum structures and functions */
@@ -144 +140 @@
 #define _MAXLINELEN     1024
 
-/* this is the internally used data structure to which pointers of 
+/* this is the internally used data structure to which pointers of
  * struct hostent ponit to, after gethostbyname_r/gethostbyaddr_r were
  * called. ATTENTION EMX: The component _opaque_ is a pointer to a data
@@ -159 +155 @@
         int     stayopen;                       /* AIX addon */
         u_long  host_addresses[_MAXADDRS];      /* Actual Addresses. */
-};                                              
+};
 
 struct servent_data {
@@ -167 +163 @@
         int     _serv_stayopen;
 };
-
-int gethostbyname_r(char*, struct hostent*, struct hostent_data*);
-int gethostbyaddr_r(char*, int, int, struct hostent*, struct hostent_data*);
-int getservbyname_r(char*, char*, struct servent*, struct servent_data*);
-struct hostent *_gethtbyname(char*);
-struct hostent *_gethtbyaddr(char*, int, int);
-int tcp_h_errno(void);  /* thread safe h_errno */
-
-#endif /* NETDB_IBM_ADDENDUM */
+#endif
+
+
+/* BSD */
+int                 _System gethostname( char *, int );
+struct hostent *    _System gethostbyname( __const__ char * );
+struct hostent *    _System gethostbyaddr( __const__ char *, int, int );
+struct netent *     _System getnetbyname( __const__ char * );
+struct netent *     _System getnetbyaddr( unsigned long, int );
+struct servent *    _System getservbyname( __const__ char *, char * );
+struct servent *    _System getservbyport( int, __const__ char * );
+struct servent *    _System getservent( void );
+struct protoent *   _System getprotobyname( __const__ char * );
+struct protoent *   _System getprotobynumber( int );
+void                _System sethostent( int );
+struct hostent *    _System gethostent( void );
+void                _System endhostent(void);
+void                _System setnetent( int );
+struct netent *     _System getnetent( void );
+void                _System endnetent(void);
+void                _System setprotoent( int );
+struct protoent *   _System getprotoent( void );
+void                _System endprotoent(void);
+void                _System setservent( int );
+struct servent *    _System getservent( void );
+void                _System endservent(void);
+#ifndef TCPV40HDRS
+struct hostent *    _System gethostbyname2( __const__ char *, int );
+#endif
+
+
+/* OS2 Additions */
+#ifdef TCPV40HDRS
+int                 _System tcp_h_errno(void);
+struct hostent *    _System Rgethostbyname(char *); /* Socks additions */
+#else
+const char *        _System hstrerror(int);
+/* void               _System sethostfile(const char *); */
+int *               _System tcp_h_errno1(void);
+#endif
+
+/* EMX/BSD additions. */
+void                herror (__const__ char *);
+
+/* EMX/BSD stuff which isn't implemeneted  */
+#ifndef TCPV40HDRS
+struct hostent_data;
+struct servent_data;
+#endif
+int                 gethostbyname_r(char*, struct hostent*, struct hostent_data*);
+int                 gethostbyaddr_r(char*, int, int, struct hostent*, struct hostent_data*);
+int                 getservbyname_r(char*, char*, struct servent*, struct servent_data*);
+struct hostent *    _gethtbyname(char*);
+struct hostent *    _gethtbyaddr(char*, int, int);
+
 
 #ifdef __RSXNT__
@@ -187 +229 @@
 
 #endif /* !_NETDB_H_ */
+