Update to lynx-2.8.6.rel5, with our local patches maintained where relevant.

tests from miod@ sthen@ jmc@ jsing@
two additional fixes from miod:
- fix uninitialized stack variable use, leading to occasional crash.
- modify the socklen_t test to include <sys/types.h>, fixes gcc2 build failures

1 files changed, 881 insertions, 857 deletions

diff --git a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c
index 658d2040893..0f5b1d34076 100644
--- a/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c
+++ b/gnu/usr.bin/lynx/WWW/Library/Implementation/HTTCP.c
@@ -1,20 +1,20 @@
 /*			Generic Communication Code		HTTCP.c
-**			==========================
-**
-**	This code is in common between client and server sides.
-**
-**	16 Jan 92  TBL	Fix strtol() undefined on CMU Mach.
-**	25 Jun 92  JFG	Added DECNET option through TCP socket emulation.
-**	13 Sep 93  MD	Added correct return of vmserrorno for HTInetStatus.
-**			Added decoding of vms error message for MULTINET.
-**	7-DEC-1993 Bjorn S. Nilsson, ALEPH, CERN, VMS UCX ioctl() changes
-**			(done of Mosaic)
-**	19 Feb 94  Danny Mayer	Added Bjorn Fixes to Lynx version
-**	 7 Mar 94  Danny Mayer	Added Fix UCX version for full domain name
-**	20 May 94  Andy Harper	Added support for CMU TCP/IP transport
-**	17 Nov 94  Andy Harper	Added support for SOCKETSHR transport
-**	16 Jul 95  S. Bjorndahl added kluge to deal with LIBCMU bug
-*/
+ *			==========================
+ *
+ *	This code is in common between client and server sides.
+ *
+ *	16 Jan 92  TBL	Fix strtol() undefined on CMU Mach.
+ *	25 Jun 92  JFG	Added DECNET option through TCP socket emulation.
+ *	13 Sep 93  MD	Added correct return of vmserrorno for HTInetStatus.
+ *			Added decoding of vms error message for MULTINET.
+ *	7-DEC-1993 Bjorn S. Nilsson, ALEPH, CERN, VMS UCX ioctl() changes
+ *			(done of Mosaic)
+ *	19 Feb 94  Danny Mayer	Added Bjorn Fixes to Lynx version
+ *	 7 Mar 94  Danny Mayer	Added Fix UCX version for full domain name
+ *	20 May 94  Andy Harper	Added support for CMU TCP/IP transport
+ *	17 Nov 94  Andy Harper	Added support for SOCKETSHR transport
+ *	16 Jul 95  S. Bjorndahl added kluge to deal with LIBCMU bug
+ */
 
 #include <HTUtils.h>
 #include <HTParse.h>
@@ -36,15 +36,18 @@
 #include <netdb.h>
 #endif /* __DJGPP__ */
 
+#define LYNX_ADDRINFO	struct addrinfo
+#define LYNX_HOSTENT	struct hostent
+
 #define OK_HOST(p) ((p) != 0 && ((p)->h_length) != 0)
 
 #ifdef SVR4_BSDSELECT
-PUBLIC int BSDselect PARAMS((
-	int		 nfds,
-	fd_set *	 readfds,
-	fd_set *	 writefds,
-	fd_set *	 exceptfds,
-	struct timeval * select_timeout));
+int BSDselect(int nfds,
+	      fd_set * readfds,
+	      fd_set * writefds,
+	      fd_set * exceptfds,
+	      struct timeval *select_timeout);
+
 #ifdef select
 #undef select
 #endif /* select */
@@ -60,79 +63,53 @@ PUBLIC int BSDselect PARAMS((
 #include <LYLeaks.h>
 
 /*
-**  Module-Wide variables
-*/
-PRIVATE char *hostname = NULL;		/* The name of this host */
+ *  Module-Wide variables
+ */
+static char *hostname = NULL;	/* The name of this host */
 
 /*
-**  PUBLIC VARIABLES
-*/
+ *  PUBLIC VARIABLES
+ */
 #ifdef SOCKS
-PUBLIC unsigned long socks_bind_remoteAddr; /* for long Rbind */
+unsigned long socks_bind_remoteAddr;	/* for long Rbind */
 #endif /* SOCKS */
 
-/* PUBLIC SockA HTHostAddress; */	/* The internet address of the host */
+/* PUBLIC SockA HTHostAddress; *//* The internet address of the host */
 					/* Valid after call to HTHostName() */
 
 /*	Encode INET status (as in sys/errno.h)			  inet_status()
-**	------------------
-**
-**  On entry,
-**	where		gives a description of what caused the error
-**	global errno	gives the error number in the Unix way.
-**
-**  On return,
-**	returns		a negative status in the Unix way.
-*/
+ *	------------------
+ *
+ *  On entry,
+ *	where		gives a description of what caused the error
+ *	global errno	gives the error number in the Unix way.
+ *
+ *  On return,
+ *	returns		a negative status in the Unix way.
+ */
 
 #ifdef DECL_SYS_ERRLIST
-extern char *sys_errlist[];		/* see man perror on cernvax */
+extern char *sys_errlist[];	/* see man perror on cernvax */
 extern int sys_nerr;
 #endif /* DECL_SYS_ERRLIST */
 
 #ifdef __DJGPP__
-static int ResolveYield (void)
+static int ResolveYield(void)
 {
-    return HTCheckForInterrupt() ? 0 : 1;
+    return HTCheckForInterrupt()? 0 : 1;
 }
 #endif
 
-/*
- * This chunk of code is used in both win32 and cygwin.
- */
-#if defined(_WINDOWS_NSL)
-static char host[512];
-static struct hostent *phost; /* Pointer to host - See netdb.h */
-static int donelookup;
-
-static unsigned long _fork_func (void *arglist GCC_UNUSED)
-{
-#ifdef SH_EX
-    unsigned long addr;
-    addr = (unsigned long)inet_addr(host);
-    if ((int)addr != -1)
-	phost = gethostbyaddr((char *)&addr, sizeof (addr), AF_INET);
-    else
-	phost = gethostbyname(host);
-#else
-    phost = gethostbyname(host);
-#endif
-    donelookup = TRUE;
-    return (unsigned long)(phost);
-}
-#endif /* _WINDOWS_NSL */
-
 #if defined(VMS) && defined(UCX)
 /*
-**  A routine to mimic the ioctl function for UCX.
-**  Bjorn S. Nilsson, 25-Nov-1993. Based on an example in the UCX manual.
-*/
+ *  A routine to mimic the ioctl function for UCX.
+ *  Bjorn S. Nilsson, 25-Nov-1993. Based on an example in the UCX manual.
+ */
 #include <HTioctl.h>
 
-PUBLIC int HTioctl ARGS3(
-	int,		d,
-	int,		request,
-	int *,		argp)
+int HTioctl(int d,
+	    int request,
+	    int *argp)
 {
     int sdc, status;
     unsigned short fun, iosb[4];
@@ -147,25 +124,26 @@ PUBLIC int HTioctl ARGS3(
 	struct comm *addr;
     } ioctl_desc;
 
-    if ((sdc = vaxc$get_sdc (d)) == 0) {
+    if ((sdc = vaxc$get_sdc(d)) == 0) {
 	set_errno(EBADF);
 	return -1;
     }
-    ioctl_desc.opt  = UCX$C_IOCTL;
-    ioctl_desc.len  = sizeof(struct comm);
+    ioctl_desc.opt = UCX$C_IOCTL;
+    ioctl_desc.len = sizeof(struct comm);
+
     ioctl_desc.addr = &ioctl_comm;
     if (request & IOC_OUT) {
 	fun = IO$_SENSEMODE;
 	p5 = 0;
-	p6 = (char *)&ioctl_desc;
+	p6 = (char *) &ioctl_desc;
     } else {
 	fun = IO$_SETMODE;
-	p5 = (char *)&ioctl_desc;
+	p5 = (char *) &ioctl_desc;
 	p6 = 0;
     }
     ioctl_comm.command = request;
-    ioctl_comm.addr = (char *)argp;
-    status = sys$qiow (0, sdc, fun, iosb, 0, 0, 0, 0, 0, 0, p5, p6);
+    ioctl_comm.addr = (char *) argp;
+    status = sys$qiow(0, sdc, fun, iosb, 0, 0, 0, 0, 0, 0, p5, p6);
     if (!(status & 01)) {
 	set_errno(status);
 	return -1;
@@ -182,13 +160,13 @@ PUBLIC int HTioctl ARGS3(
 	   /* third arg is transport/platform specific */
 
 /*	Report Internet Error
-**	---------------------
-*/
-PUBLIC int HTInetStatus ARGS1(
-	char *,		where)
+ *	---------------------
+ */
+int HTInetStatus(const char *where)
 {
     int status;
     int saved_errno = errno;
+
 #ifdef VMS
 #ifdef MULTINET
     SOCKET_ERRNO = vmserrno;
@@ -196,43 +174,43 @@ PUBLIC int HTInetStatus ARGS1(
 #endif /* VMS */
 
 #ifdef VM
-    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO,  where,
-	   "(Error number not translated)"));	/* What Is the VM equiv? */
+    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO, where,
+	    "(Error number not translated)"));	/* What Is the VM equiv? */
 #define ER_NO_TRANS_DONE
 #endif /* VM */
 
 #ifdef VMS
 #ifdef MULTINET
-    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO,  where,
-	   vms_errno_string()));
+    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO, where,
+	    vms_errno_string()));
 #else
-    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO,  where,
-	   ((SOCKET_ERRNO > 0 && SOCKET_ERRNO <= 65) ?
-	    strerror(SOCKET_ERRNO) : "(Error number not translated)")));
+    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO, where,
+	    ((SOCKET_ERRNO > 0 && SOCKET_ERRNO <= 65) ?
+	     strerror(SOCKET_ERRNO) : "(Error number not translated)")));
 #endif /* MULTINET */
 #define ER_NO_TRANS_DONE
 #endif /* VMS */
 
 #ifdef HAVE_STRERROR
-    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO,  where,
-	   strerror(SOCKET_ERRNO)));
+    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO, where,
+	    strerror(SOCKET_ERRNO)));
 #define ER_NO_TRANS_DONE
 #endif /* HAVE_STRERROR */
 
 #ifndef ER_NO_TRANS_DONE
-    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO,  where,
-	   (SOCKET_ERRNO < sys_nerr ?
-	    sys_errlist[SOCKET_ERRNO] : "Unknown error" )));
+    CTRACE((tfp, MY_FORMAT, SOCKET_ERRNO, where,
+	    (SOCKET_ERRNO < sys_nerr ?
+	     sys_errlist[SOCKET_ERRNO] : "Unknown error")));
 #endif /* !ER_NO_TRANS_DONE */
 
 #ifdef VMS
 #ifndef MULTINET
     CTRACE((tfp,
-	   "         Unix error number (SOCKET_ERRNO) = %ld dec\n",
-	   SOCKET_ERRNO));
+	    "         Unix error number (SOCKET_ERRNO) = %ld dec\n",
+	    SOCKET_ERRNO));
     CTRACE((tfp,
-	   "         VMS error (vaxc$errno)    = %lx hex\n",
-	   vaxc$errno));
+	    "         VMS error (vaxc$errno)    = %lx hex\n",
+	    vaxc$errno));
 #endif /* MULTINET */
 #endif /* VMS */
 
@@ -240,8 +218,8 @@ PUBLIC int HTInetStatus ARGS1(
 
 #ifdef VMS
     /*
-    **	uerrno and errno happen to be zero if vmserrno <> 0
-    */
+     * uerrno and errno happen to be zero if vmserrno <> 0
+     */
 #ifdef MULTINET
     status = -vmserrno;
 #else
@@ -254,95 +232,96 @@ PUBLIC int HTInetStatus ARGS1(
 }
 
 /*	Parse a cardinal value				       parse_cardinal()
-**	----------------------
-**
-** On entry,
-**	*pp	    points to first character to be interpreted, terminated by
-**		    non 0:9 character.
-**	*pstatus    points to status already valid
-**	maxvalue    gives the largest allowable value.
-**
-** On exit,
-**	*pp	    points to first unread character
-**	*pstatus    points to status updated iff bad
-*/
-PUBLIC unsigned int HTCardinal ARGS3(
-	int *,		pstatus,
-	char **,	pp,
-	unsigned int,	max_value)
+ *	----------------------
+ *
+ * On entry,
+ *	*pp	    points to first character to be interpreted, terminated by
+ *		    non 0:9 character.
+ *	*pstatus    points to status already valid
+ *	maxvalue    gives the largest allowable value.
+ *
+ * On exit,
+ *	*pp	    points to first unread character
+ *	*pstatus    points to status updated iff bad
+ */
+unsigned int HTCardinal(int *pstatus,
+			char **pp,
+			unsigned int max_value)
 {
     unsigned int n;
-    if ((**pp<'0') || (**pp>'9')) {	    /* Null string is error */
-	*pstatus = -3;	/* No number where one expected */
+
+    if ((**pp < '0') || (**pp > '9')) {		/* Null string is error */
+	*pstatus = -3;		/* No number where one expected */
 	return 0;
     }
 
     n = 0;
     while ((**pp >= '0') && (**pp <= '9'))
-	n = n*10 + *((*pp)++) - '0';
+	n = n * 10 + *((*pp)++) - '0';
 
     if (n > max_value) {
-	*pstatus = -4;	/* Cardinal outside range */
+	*pstatus = -4;		/* Cardinal outside range */
 	return 0;
     }
 
     return n;
 }
 
-#ifndef DECNET	/* Function only used below for a trace message */
+#ifndef DECNET			/* Function only used below for a trace message */
 /*	Produce a string for an Internet address
-**	----------------------------------------
-**
-**  On exit,
-**	returns a pointer to a static string which must be copied if
-**		it is to be kept.
-*/
-PUBLIC CONST char * HTInetString ARGS1(
-	SockA*,		soc_in)
+ *	----------------------------------------
+ *
+ *  On exit,
+ *	returns a pointer to a static string which must be copied if
+ *		it is to be kept.
+ */
+const char *HTInetString(SockA * soc_in)
 {
 #ifdef INET6
     static char hostbuf[MAXHOSTNAMELEN];
-    getnameinfo((struct sockaddr *)soc_in,
-	    SOCKADDR_LEN(soc_in),
-	    hostbuf, sizeof(hostbuf), NULL, 0, NI_NUMERICHOST);
+
+    getnameinfo((struct sockaddr *) soc_in,
+		SOCKADDR_LEN(soc_in),
+		hostbuf, sizeof(hostbuf), NULL, 0, NI_NUMERICHOST);
     return hostbuf;
 #else
     static char string[20];
+
     sprintf(string, "%d.%d.%d.%d",
-	    (int)*((unsigned char *)(&soc_in->sin_addr)+0),
-	    (int)*((unsigned char *)(&soc_in->sin_addr)+1),
-	    (int)*((unsigned char *)(&soc_in->sin_addr)+2),
-	    (int)*((unsigned char *)(&soc_in->sin_addr)+3));
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 0),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 1),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 2),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 3));
     return string;
 #endif /* INET6 */
 }
 #endif /* !DECNET */
 
 /*	Check whether string is a valid Internet hostname - kw
-**	-------------------------------------------------
-**
-**  Checks whether
-**  - contains only valid chars for domain names (actually, the
-**    restrictions are somewhat relaxed),
-**  - no leading dots or empty segments,
-**  - no segment starts with '-' or '+' [this protects telnet command],
-**  - max. length of dot-separated segment <= 63 (RFC 1034,1035),
-**  - total length <= 254 (if it ends with dot) or 253 (otherwise)
-**     [an interpretation of RFC 1034,1035, although RFC 1123
-**      suggests 255 as limit - kw].
-**
-**  Note: user (before '@') and port (after ':') components from
-**      host part of URL should be already stripped (if appropriate)
-**      from the input string.
-**
-**  On exit,
-**	returns 1 if valid, otherwise 0.
-*/
-PUBLIC BOOL valid_hostname ARGS1(
-	char *,	name)
+ *	-------------------------------------------------
+ *
+ *  Checks whether
+ *  - contains only valid chars for domain names (actually, the
+ *    restrictions are somewhat relaxed),
+ *  - no leading dots or empty segments,
+ *  - no segment starts with '-' or '+' [this protects telnet command],
+ *  - max. length of dot-separated segment <= 63 (RFC 1034,1035),
+ *  - total length <= 254 (if it ends with dot) or 253 (otherwise)
+ *     [an interpretation of RFC 1034,1035, although RFC 1123
+ *      suggests 255 as limit - kw].
+ *
+ *  Note: user (before '@') and port (after ':') components from
+ *      host part of URL should be already stripped (if appropriate)
+ *      from the input string.
+ *
+ *  On exit,
+ *	returns 1 if valid, otherwise 0.
+ */
+BOOL valid_hostname(char *name)
 {
-    int i=1, iseg = 0;
+    int i = 1, iseg = 0;
     char *cp = name;
+
     if (!(name && *name))
 	return NO;
     for (; (*cp && i <= 253); cp++, i++) {
@@ -369,70 +348,69 @@ PUBLIC BOOL valid_hostname ARGS1(
 
 #ifdef NSL_FORK
 /*
-**  Function to allow us to be killed with a normal signal (not
-**  SIGKILL), but don't go through normal libc exit() processing, which
-**  would screw up parent's stdio.  -BL
-*/
-PRIVATE void quench ARGS1(
-	int,	sig GCC_UNUSED)
+ *  Function to allow us to be killed with a normal signal (not
+ *  SIGKILL), but don't go through normal libc exit() processing, which
+ *  would screw up parent's stdio.  -BL
+ */
+static void quench(int sig GCC_UNUSED)
 {
     _exit(2);
 }
 #endif /* NSL_FORK */
 
-PUBLIC int lynx_nsl_status = HT_OK;
+int lynx_nsl_status = HT_OK;
 
 #define DEBUG_HOSTENT		/* disable in case of problems */
-#define DEBUG_HOSTENT_CHILD  /* for NSL_FORK, may screw up trace file */
+#define DEBUG_HOSTENT_CHILD	/* for NSL_FORK, may screw up trace file */
 
 /*
-**  Two auxiliary functions for name lookup and struct hostent.
-**
-**  dump_hostent - dumps the contents of a struct hostent to the
-**  trace log or stderr, including all pointer values, strings, and
-**  addresses, in a format inspired by gdb's print format. - kw
-*/
-PRIVATE void dump_hostent ARGS2(
-    CONST char *,		msgprefix,
-    CONST struct hostent *,	phost)
+ *  Two auxiliary functions for name lookup and LYNX_HOSTENT.
+ *
+ *  dump_hostent - dumps the contents of a LYNX_HOSTENT to the
+ *  trace log or stderr, including all pointer values, strings, and
+ *  addresses, in a format inspired by gdb's print format. - kw
+ */
+static void dump_hostent(const char *msgprefix,
+			 const LYNX_HOSTENT *phost)
 {
     if (TRACE) {
 	int i;
 	char **pcnt;
-	CTRACE((tfp,"%s: %p ", msgprefix, phost));
+
+	CTRACE((tfp, "%s: %p ", msgprefix, phost));
 	if (phost) {
-	    CTRACE((tfp,"{ h_name = %p", phost->h_name));
+	    CTRACE((tfp, "{ h_name = %p", phost->h_name));
 	    if (phost->h_name) {
 		CTRACE((tfp, " \"%s\",", phost->h_name));
 	    } else {
 		CTRACE((tfp, ","));
 	    }
-	    CTRACE((tfp,"\n\t h_aliases = %p", phost->h_aliases));
+	    CTRACE((tfp, "\n\t h_aliases = %p", phost->h_aliases));
 	    if (phost->h_aliases) {
 		CTRACE((tfp, " {"));
 		for (pcnt = phost->h_aliases; *pcnt; pcnt++) {
-		    CTRACE((tfp,"%s %p \"%s\"",
-			   (pcnt == phost->h_aliases ? " " : ", "),
-			   *pcnt, *pcnt));
+		    CTRACE((tfp, "%s %p \"%s\"",
+			    (pcnt == phost->h_aliases ? " " : ", "),
+			    *pcnt, *pcnt));
 		}
 		CTRACE((tfp, "%s0x0 },\n\t",
-		       (*phost->h_aliases ? ", " : " ")));
+			(*phost->h_aliases ? ", " : " ")));
 	    } else {
 		CTRACE((tfp, ",\n\t"));
 	    }
-	    CTRACE((tfp," h_addrtype = %d,", phost->h_addrtype));
-	    CTRACE((tfp," h_length = %d,\n\t", phost->h_length));
-	    CTRACE((tfp," h_addr_list = %p", phost->h_addr_list));
+	    CTRACE((tfp, " h_addrtype = %d,", phost->h_addrtype));
+	    CTRACE((tfp, " h_length = %d,\n\t", phost->h_length));
+	    CTRACE((tfp, " h_addr_list = %p", phost->h_addr_list));
 	    if (phost->h_addr_list) {
 		CTRACE((tfp, " {"));
 		for (pcnt = phost->h_addr_list; *pcnt; pcnt++) {
-		    CTRACE((tfp,"%s %p",
-			   (pcnt == phost->h_addr_list ? "" : ","),
-			   *pcnt));
+		    CTRACE((tfp, "%s %p",
+			    (pcnt == phost->h_addr_list ? "" : ","),
+			    *pcnt));
 		    for (i = 0; i < phost->h_length; i++) {
-			CTRACE((tfp, "%s%d%s", (i==0 ? " \"" : "."),
-			       (int)*((unsigned char *)(*pcnt)+i),
-			       (i+1 == phost->h_length ? "\"" : "")));
+			CTRACE((tfp, "%s%d%s", (i == 0 ? " \"" : "."),
+				(int) *((unsigned char *) (*pcnt) + i),
+				(i + 1 == phost->h_length ? "\"" : "")));
 		    }
 		}
 		if (*phost->h_addr_list) {
@@ -444,34 +422,33 @@ PRIVATE void dump_hostent ARGS2(
 		CTRACE((tfp, "}"));
 	    }
 	}
-	CTRACE((tfp,"\n"));
+	CTRACE((tfp, "\n"));
 	fflush(tfp);
     }
 }
 
 /*
-**  fill_rehostent - copies as much as possible relevant content from
-**  the struct hostent pointed to by phost to the char buffer given
-**  by rehostent, subject to maximum output length rehostentsize,
-**  following pointers and building self-contained output which can be
-**  cast to a struct hostent. - kw
-**  See also description of LYGetHostByName.
-*/
-#ifdef NSL_FORK
+ *  fill_rehostent - copies as much as possible relevant content from
+ *  the LYNX_HOSTENT pointed to by phost to the char buffer given
+ *  by rehostent, subject to maximum output length rehostentsize,
+ *  following pointers and building self-contained output which can be
+ *  cast to a LYNX_HOSTENT. - kw
+ *  See also description of LYGetHostByName.
+ */
+#if defined(NSL_FORK) || defined(_WINDOWS_NSL)
 
-#define REHOSTENT_SIZE 128		/* not bigger than pipe buffer! */
+#define REHOSTENT_SIZE 128	/* not bigger than pipe buffer! */
 
 typedef struct {
-	struct hostent	h;
-	char		rest[REHOSTENT_SIZE];
-    } AlignedHOSTENT;
-
-PRIVATE size_t fill_rehostent ARGS3(
-    char *,			rehostent,
-    size_t,			rehostentsize,
-    CONST struct hostent *,	phost)
+    LYNX_HOSTENT h;
+    char rest[REHOSTENT_SIZE];
+} AlignedHOSTENT;
+
+static size_t fill_rehostent(char *rehostent,
+			     size_t rehostentsize,
+			     const LYNX_HOSTENT *phost)
 {
-    AlignedHOSTENT *data = (AlignedHOSTENT *)rehostent;
+    AlignedHOSTENT *data = (AlignedHOSTENT *) rehostent;
     int num_addrs = 0;
     int num_aliases = 0;
     char **pcnt;
@@ -479,7 +456,7 @@ PRIVATE size_t fill_rehostent ARGS3(
     char **p_next_charptr;
     size_t name_len = 0;
     size_t required_per_addr;
-    size_t curlen = sizeof(struct hostent);
+    size_t curlen = sizeof(LYNX_HOSTENT);
     size_t available = rehostentsize - curlen;
     size_t chk_available, mem_this_alias, required_this_alias;
     int i_addr, i_alias;
@@ -487,6 +464,7 @@ PRIVATE size_t fill_rehostent ARGS3(
     if (!phost)
 	return 0;
     required_per_addr = phost->h_length + sizeof(char *);
+
     if (phost->h_addr_list)
 	available -= sizeof(phost->h_addr_list[0]);
     if (phost->h_aliases)
@@ -510,7 +488,7 @@ PRIVATE size_t fill_rehostent ARGS3(
 	}
     }
     if (num_addrs) {
-	for (pcnt=phost->h_addr_list+1; *pcnt; pcnt++) {
+	for (pcnt = phost->h_addr_list + 1; *pcnt; pcnt++) {
 	    if (available >= required_per_addr) {
 		num_addrs++;
 		available -= required_per_addr;
@@ -521,7 +499,7 @@ PRIVATE size_t fill_rehostent ARGS3(
     }
     chk_available = available;
     if (phost->h_aliases) {
-	for (pcnt=phost->h_aliases; *pcnt; pcnt++) {
+	for (pcnt = phost->h_aliases; *pcnt; pcnt++) {
 	    required_this_alias = sizeof(phost->h_aliases[0]) +
 		strlen(*pcnt) + 1;
 	    if (chk_available >= required_this_alias) {
@@ -533,16 +511,16 @@ PRIVATE size_t fill_rehostent ARGS3(
 
     data->h.h_addrtype = phost->h_addrtype;
     data->h.h_length = phost->h_length;
-    p_next_charptr = (char **)(rehostent + curlen);
+    p_next_charptr = (char **) (rehostent + curlen);
     p_next_char = rehostent + curlen;
     if (phost->h_addr_list)
-	p_next_char += (num_addrs+1) * sizeof(phost->h_addr_list[0]);
+	p_next_char += (num_addrs + 1) * sizeof(phost->h_addr_list[0]);
     if (phost->h_aliases)
-	p_next_char += (num_aliases+1) * sizeof(phost->h_aliases[0]);
+	p_next_char += (num_aliases + 1) * sizeof(phost->h_aliases[0]);
 
     if (phost->h_addr_list) {
 	data->h.h_addr_list = p_next_charptr;
-	for (pcnt=phost->h_addr_list, i_addr = 0;
+	for (pcnt = phost->h_addr_list, i_addr = 0;
 	     i_addr < num_addrs;
 	     pcnt++, i_addr++) {
 	    memcpy(p_next_char, *pcnt, sizeof(phost->h_addr_list[0]));
@@ -568,7 +546,7 @@ PRIVATE size_t fill_rehostent ARGS3(
 
     if (phost->h_aliases) {
 	data->h.h_aliases = p_next_charptr;
-	for (pcnt=phost->h_aliases, i_alias = 0;
+	for (pcnt = phost->h_aliases, i_alias = 0;
 	     (*pcnt && i_alias < num_addrs);
 	     pcnt++, i_alias++) {
 	    mem_this_alias = strlen(*pcnt) + 1;
@@ -587,86 +565,150 @@ PRIVATE size_t fill_rehostent ARGS3(
     } else {
 	data->h.h_aliases = NULL;
     }
-    curlen = p_next_char - (char *)rehostent;
+    curlen = p_next_char - (char *) rehostent;
     return curlen;
 }
+
+/*
+ * This chunk of code is used in both win32 and cygwin.
+ */
+#if defined(_WINDOWS_NSL)
+static LYNX_HOSTENT *gbl_phost;	/* Pointer to host - See netdb.h */
+
+#ifndef __CYGWIN__
+static int donelookup;
+
+static unsigned long __stdcall _fork_func(void *arg)
+{
+    const char *host = (const char *) arg;
+    static AlignedHOSTENT aligned_full_rehostent;
+    char *rehostent = (char *) &aligned_full_rehostent;
+    size_t rehostentlen = 0;
+
+#ifdef SH_EX
+    unsigned long addr;
+
+    addr = (unsigned long) inet_addr(host);
+    if (addr != INADDR_NONE)
+	gbl_phost = gethostbyaddr((char *) &addr, sizeof(addr), AF_INET);
+    else
+	gbl_phost = gethostbyname(host);
+#else
+    gbl_phost = gethostbyname(host);
+#endif
+
+    if (gbl_phost) {
+	rehostentlen = fill_rehostent(rehostent, REHOSTENT_SIZE, gbl_phost);
+	if (rehostentlen == 0) {
+	    gbl_phost = (LYNX_HOSTENT *) NULL;
+	} else {
+	    gbl_phost = (LYNX_HOSTENT *) rehostent;
+	}
+    }
+
+    donelookup = TRUE;
+    return (unsigned long) (gbl_phost);
+}
+#endif /* __CYGWIN__ */
+#endif /* _WINDOWS_NSL */
 #endif /* NSL_FORK */
 
 #ifndef HAVE_H_ERRNO
 #undef  h_errno
 #define h_errno my_errno
 static int my_errno;
+
 #else /* we do HAVE_H_ERRNO: */
-#ifndef h_errno		/* there may be a macro as well as the extern data */
+#ifndef h_errno			/* there may be a macro as well as the extern data */
 extern int h_errno;
 #endif
 #endif
 
+/*
+ * Even though it is a small amount, we cannot count on reading the whole
+ * struct via a pipe in one read -TD
+ */
+#ifdef NSL_FORK
+static unsigned readit(int fd, char *buffer, unsigned length)
+{
+    unsigned result = 0;
+
+    while (length != 0) {
+	unsigned got = read(fd, buffer, length);
+
+	if (got != 0) {
+	    result += got;
+	    buffer += got;
+	    length -= got;
+	} else {
+	    break;
+	}
+    }
+    return result;
+}
+#endif /* NSL_FORK */
+
 /*	Resolve an internet hostname, like gethostbyname
-**	------------------------------------------------
-**
-**  On entry,
-**	str	points to the given host name, not numeric address,
-**		without colon or port number.
-**
-**  On exit,
-**	returns a pointer to a struct hostent in static storage,
-**	or NULL in case of error or user interruption.
-**
-**  The interface is intended to be exactly the same as for (Unix)
-**  gethostbyname(), except for the following:
-**
-**  If NSL_FORK is not used, the result of gethostbyname is returned
-**  directly.  Otherwise:
-**  All lists, addresses, and strings referred to by pointers in the
-**  returned struct are located, together with the returned struct
-**  itself, in a buffer of size REHOSTENT_SIZE.  If not everything fits,
-**  some info is omitted, but the function is careful to still return
-**  a valid structure, without truncating strings; it tries to return,
-**  in order of decreasing priority, the first address (h_addr), the
-**  official name (h_name), the additional addresses, then alias names.
-**
-**  If NULL is returned, the reason is made available in the global
-**  variable lynx_nsl_status, with one of the following values:
-**	HT_INTERRUPTED		Interrupted by user
-**	HT_NOT_ACCEPTABLE	Hostname detected as invalid
-**				(also sets h_errno)
-**	HT_H_ERRNO_VALID	An error occurred, and h_errno holds
-**				an appropriate value
-**	HT_ERROR		Resolver error, reason not known
-**	HT_INTERNAL		Internal error
-*/
-PUBLIC struct hostent * LYGetHostByName ARGS1(
-	char *,	str)
+ *	------------------------------------------------
+ *
+ *  On entry,
+ *	str	points to the given host name, not numeric address,
+ *		without colon or port number.
+ *
+ *  On exit,
+ *	returns a pointer to a LYNX_HOSTENT in static storage,
+ *	or NULL in case of error or user interruption.
+ *
+ *  The interface is intended to be exactly the same as for (Unix)
+ *  gethostbyname(), except for the following:
+ *
+ *  If NSL_FORK is not used, the result of gethostbyname is returned
+ *  directly.  Otherwise:
+ *  All lists, addresses, and strings referred to by pointers in the
+ *  returned struct are located, together with the returned struct
+ *  itself, in a buffer of size REHOSTENT_SIZE.  If not everything fits,
+ *  some info is omitted, but the function is careful to still return
+ *  a valid structure, without truncating strings; it tries to return,
+ *  in order of decreasing priority, the first address (h_addr_list[0]), the
+ *  official name (h_name), the additional addresses, then alias names.
+ *
+ *  If NULL is returned, the reason is made available in the global
+ *  variable lynx_nsl_status, with one of the following values:
+ *	HT_INTERRUPTED		Interrupted by user
+ *	HT_NOT_ACCEPTABLE	Hostname detected as invalid
+ *				(also sets h_errno)
+ *	HT_H_ERRNO_VALID	An error occurred, and h_errno holds
+ *				an appropriate value
+ *	HT_ERROR		Resolver error, reason not known
+ *	HT_INTERNAL		Internal error
+ */
+LYNX_HOSTENT *LYGetHostByName(char *str)
 {
-#ifndef _WINDOWS_NSL
     char *host = str;
-#endif
 
 #ifdef NSL_FORK
     /* for transfer of result between from child to parent: */
     static AlignedHOSTENT aligned_full_rehostent;
+
     /*
-     * We could define rehosten directly as a
-     * static char rehostent[REHOSTENT_SIZE],
-     * but the indirect approach via the above struct
-     * should automatically take care of alignment requirements.
+     * We could define rehosten directly as a static char
+     * rehostent[REHOSTENT_SIZE], but the indirect approach via the above
+     * struct should automatically take care of alignment requirements.
      * Note that, in addition,
-     *  - this must be static, as we shall return a pointer to it
-     *    which must remain valid, and
-     *  - we have to use the same rehostent in the child process as
-     *    in the parent (its address in the parent's address space
-     *    must be the same as in the child's, otherwise the internal
-     *    pointers built by the child's call to fill_rehostent would
-     *    be invalid when seen by the parent). - kw
+     * - this must be static, as we shall return a pointer to it which must
+     *   remain valid, and
+     * - we have to use the same rehostent in the child process as in the
+     *   parent (its address in the parent's address space must be the same as
+     *   in the child's, otherwise the internal pointers built by the child's
+     *   call to fill_rehostent would be invalid when seen by the parent).  -kw
      */
-    char *rehostent = (char *)&aligned_full_rehostent;
+    char *rehostent = (char *) &aligned_full_rehostent;
 
     /* for transfer of status from child to parent: */
     struct _statuses {
 	size_t rehostentlen;
 	int h_length;
-	int child_errno;  /* sometimes useful to pass this on */
+	int child_errno;	/* sometimes useful to pass this on */
 	int child_h_errno;
 	BOOL h_errno_valid;
     } statuses;
@@ -674,7 +716,7 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
     size_t rehostentlen = 0;
 #endif /* NSL_FORK */
 
-    struct hostent *result_phost = NULL;
+    LYNX_HOSTENT *result_phost = NULL;
 
 #ifdef __DJGPP__
     _resolve_hook = ResolveYield;
@@ -687,17 +729,13 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
     }
     CTRACE((tfp, "LYGetHostByName: parsing `%s'.\n", str));
 
-	/*  Could disable this if all our callers already check - kw */
+    /*  Could disable this if all our callers already check - kw */
     if (HTCheckForInterrupt()) {
 	CTRACE((tfp, "LYGetHostByName: INTERRUPTED for '%s'.\n", str));
 	lynx_nsl_status = HT_INTERRUPTED;
 	return NULL;
     }
 
-#ifdef _WINDOWS_NSL
-    strncpy(host, str, sizeof(host));
-#endif /*  _WINDOWS_NSL */
-
     if (!valid_hostname(host)) {
 	lynx_nsl_status = HT_NOT_ACCEPTABLE;
 #ifdef NO_RECOVERY
@@ -709,53 +747,54 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 #endif
 	return NULL;
     }
-
-#ifdef MVS	/* Outstanding problem with crash in MVS gethostbyname */
+#ifdef MVS			/* Outstanding problem with crash in MVS gethostbyname */
     CTRACE((tfp, "LYGetHostByName: Calling gethostbyname(%s)\n", host));
 #endif /* MVS */
 
-    CTRACE_FLUSH(tfp);  /* so child messages will not mess up parent log */
+    CTRACE_FLUSH(tfp);		/* so child messages will not mess up parent log */
 
     lynx_nsl_status = HT_INTERNAL;	/* should be set to something else below */
 
 #ifdef NSL_FORK
     statuses.h_errno_valid = NO;
-	/*
-	**  Start block for fork-based gethostbyname() with
-	**  checks for interrupts. - Tom Zerucha (tz@execpc.com) & FM
-	*/
+    /*
+     * Start block for fork-based gethostbyname() with checks for interrupts.
+     * - Tom Zerucha (tz@execpc.com) & FM
+     */
     {
 	int got_rehostent = 0;
+
 #if HAVE_SIGACTION
 	sigset_t old_sigset;
 	sigset_t new_sigset;
 #endif
 	/*
-	**	Pipe, child pid, status buffers, start time, select()
-	**	control variables.
-	*/
+	 * Pipe, child pid, status buffers, start time, select() control
+	 * variables.
+	 */
 	int fpid, waitret;
 	int pfd[2], selret, readret;
+
 #ifdef HAVE_TYPE_UNIONWAIT
 	union wait waitstat;
+
 #else
 	int waitstat = 0;
 #endif
-	time_t start_time = time((time_t *)0);
+	time_t start_time = time((time_t *) 0);
 	fd_set readfds;
 	struct timeval one_second;
-	long dns_patience = 30; /* how many seconds will we wait for DNS? */
+	long dns_patience = 30;	/* how many seconds will we wait for DNS? */
 	int child_exited = 0;
 
-	    /*
-	    **  Reap any children that have terminated since last time
-	    **  through.  This might include children that we killed,
-	    **  then waited with WNOHANG before they were actually ready
-	    **  to be reaped.  (Should be max of 1 in this state, but
-	    **  the loop is safe if waitpid() is implemented correctly:
-	    **  returns 0 when children exist but none have exited; -1
-	    **  with errno == ECHILD when no children.)  -BL
-	    */
+	/*
+	 * Reap any children that have terminated since last time through.
+	 * This might include children that we killed, then waited with WNOHANG
+	 * before they were actually ready to be reaped.  (Should be max of 1
+	 * in this state, but the loop is safe if waitpid() is implemented
+	 * correctly:  returns 0 when children exist but none have exited; -1
+	 * with errno == ECHILD when no children.) -BL
+	 */
 	do {
 	    waitret = waitpid(-1, 0, WNOHANG);
 	} while (waitret > 0 || (waitret == -1 && errno == EINTR));
@@ -765,14 +804,13 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 
 #if HAVE_SIGACTION
 	/*
-	 *  Attempt to prevent a rare situation where the child
-	 *  could execute the Lynx signal handlers because it gets
-	 *  killed before it even has a chance to reset its handlers,
-	 *  resulting in bogus 'Exiting via interrupt' message and
-	 *  screen corruption or worse.
-	 *  Should that continue to be reported, for systems without
-	 *  sigprocmask(), we need to find a different solutions for
-	 *  those. - kw 19990430
+	 * Attempt to prevent a rare situation where the child could execute
+	 * the Lynx signal handlers because it gets killed before it even has a
+	 * chance to reset its handlers, resulting in bogus 'Exiting via
+	 * interrupt' message and screen corruption or worse.
+	 * Should that continue to be reported, for systems without
+	 * sigprocmask(), we need to find a different solutions for those.  -
+	 * kw 19990430
 	 */
 	sigemptyset(&new_sigset);
 	sigaddset(&new_sigset, SIGTERM);
@@ -789,22 +827,22 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	sigprocmask(SIG_BLOCK, &new_sigset, &old_sigset);
 #endif /* HAVE_SIGACTION */
 
-	if ((fpid = fork()) == 0 ) {
-	    struct hostent  *phost;	/* Pointer to host - See netdb.h */
+	if ((fpid = fork()) == 0) {
+	    LYNX_HOSTENT *phost;	/* Pointer to host - See netdb.h */
+
 	    /*
-	    **  Child - for the long call.
-	    **
-	    **  Make sure parent can kill us at will.  -BL
-	    */
+	     * Child - for the long call.
+	     *
+	     * Make sure parent can kill us at will.  -BL
+	     */
 	    (void) signal(SIGTERM, quench);
 
 	    /*
-	    **  Also make sure the child does not run one of the
-	    **  signal handlers that may have been installed by
-	    **  Lynx if one of those signals occurs.  For example
-	    **  we don't want the child to remove temp files on
-	    **  ^C, let the parent deal with that. - kw
-	    */
+	     * Also make sure the child does not run one of the signal handlers
+	     * that may have been installed by Lynx if one of those signals
+	     * occurs.  For example we don't want the child to remove temp
+	     * files on ^C, let the parent deal with that.  - kw
+	     */
 	    (void) signal(SIGINT, quench);
 #ifndef NOSIGHUP
 	    (void) signal(SIGHUP, quench);
@@ -832,8 +870,8 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 #endif /* HAVE_SIGACTION */
 
 	    /*
-	    **  Child won't use read side.  -BL
-	    */
+	     * Child won't use read side.  -BL
+	     */
 	    close(pfd[0]);
 #ifdef HAVE_H_ERRNO
 	    /* to detect cases when it doesn't get set although it should */
@@ -856,80 +894,80 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	    if (OK_HOST(phost)) {
 		rehostentlen = fill_rehostent(rehostent, REHOSTENT_SIZE, phost);
 #ifdef DEBUG_HOSTENT_CHILD
-		dump_hostent("CHILD fill_rehostent", (struct hostent *)rehostent);
+		dump_hostent("CHILD fill_rehostent", (LYNX_HOSTENT *) rehostent);
 #endif
 	    }
-	    if (rehostentlen <= sizeof(struct hostent) ||
-		!OK_HOST((struct hostent *)rehostent)) {
+	    if (rehostentlen <= sizeof(LYNX_HOSTENT) ||
+		!OK_HOST((LYNX_HOSTENT *) rehostent)) {
 		rehostentlen = 0;
 		statuses.h_length = 0;
 	    } else {
-		statuses.h_length = ((struct hostent *)rehostent)->h_length;
+		statuses.h_length = ((LYNX_HOSTENT *) rehostent)->h_length;
 #ifdef HAVE_H_ERRNO
-		if (h_errno == -2) /* success, but h_errno unchanged? */
+		if (h_errno == -2)	/* success, but h_errno unchanged? */
 		    statuses.h_errno_valid = NO;
 #endif
 	    }
 	    /*
-	    **  Send variables indicating status of lookup to parent.
-	    **  That includes rehostentlen, which the parent will use
-	    **  as the size for the second read (if > 0).
-	    */
+	     * Send variables indicating status of lookup to parent.  That
+	     * includes rehostentlen, which the parent will use as the size for
+	     * the second read (if > 0).
+	     */
 	    if (!statuses.child_errno)
-	    statuses.child_errno = errno;
+		statuses.child_errno = errno;
 	    statuses.rehostentlen = rehostentlen;
 	    write(pfd[1], &statuses, sizeof(statuses));
 
-
 	    if (rehostentlen) {
 		/*
-		**  Return our resulting rehostent through pipe...
-		*/
+		 * Return our resulting rehostent through pipe...
+		 */
 		write(pfd[1], rehostent, rehostentlen);
+		close(pfd[1]);
 		_exit(0);
 	    } else {
 		/*
-		**  ... or return error as exit code.
-		*/
+		 * ...  or return error as exit code.
+		 */
 		_exit(1);
 	    }
 	}
-
 #if HAVE_SIGACTION
 	/*
-	**  (parent) Restore signal mask to whatever it was
-	**  before the fork. - kw
-	*/
+	 * (parent) Restore signal mask to whatever it was before the fork.  -
+	 * kw
+	 */
 	sigprocmask(SIG_SETMASK, &old_sigset, NULL);
 #endif /* HAVE_SIGACTION */
 
 	/*
-	**	(parent) Wait until lookup finishes, or interrupt,
-	**	or cycled too many times (just in case) -BL
-	*/
+	 * (parent) Wait until lookup finishes, or interrupt, or cycled too
+	 * many times (just in case) -BL
+	 */
 
-	close(pfd[1]);      /* parent won't use write side -BL */
+	close(pfd[1]);		/* parent won't use write side -BL */
 
-	if (fpid < 0) {     /* fork failed */
-		close(pfd[0]);
-		goto failed;
+	if (fpid < 0) {		/* fork failed */
+	    close(pfd[0]);
+	    goto failed;
 	}
 
-	while (child_exited || (long)(time((time_t *)0) - start_time) < dns_patience) {
+	while (child_exited || (long) (time((time_t *) 0) - start_time) < dns_patience) {
 
 	    FD_ZERO(&readfds);
 	    /*
-	    **  This allows us to abort immediately, not after 1-second
-	    **  timeout, when user hits abort key.  Can't do this when
-	    **  using SLANG (or at least I don't know how), so SLANG
-	    **  users must live with up-to-1s timeout.  -BL
-	    **
-	    **  Whoops -- we need to make sure stdin is actually
-	    **  selectable!  /dev/null isn't, on some systems, which
-	    **  makes some useful Lynx invocations fail.  -BL
-	    */
+	     * This allows us to abort immediately, not after 1-second timeout,
+	     * when user hits abort key.  Can't do this when using SLANG (or at
+	     * least I don't know how), so SLANG users must live with up-to-1s
+	     * timeout.  -BL
+	     *
+	     * Whoops -- we need to make sure stdin is actually selectable!
+	     * /dev/null isn't, on some systems, which makes some useful Lynx
+	     * invocations fail.  -BL
+	     */
 	    {
 		int kbd_fd = LYConsoleInputFD(TRUE);
+
 		if (kbd_fd != INVSOC) {
 		    FD_SET(kbd_fd, &readfds);
 		}
@@ -939,23 +977,23 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	    one_second.tv_usec = 0;
 	    FD_SET(pfd[0], &readfds);
 
-		/*
-		**  Return when data received, interrupted, or failed.
-		**  If nothing is waiting, we sleep for 1 second in
-		**  select(), to be nice to the system.  -BL
-		*/
+	    /*
+	     * Return when data received, interrupted, or failed.  If nothing
+	     * is waiting, we sleep for 1 second in select(), to be nice to the
+	     * system.  -BL
+	     */
 #ifdef SOCKS
 	    if (socks_flag)
-		selret = Rselect(pfd[0] + 1, (void *)&readfds, NULL, NULL, &one_second);
+		selret = Rselect(pfd[0] + 1, &readfds, NULL, NULL, &one_second);
 	    else
 #endif /* SOCKS */
-		selret = select(pfd[0] + 1, (void *)&readfds, NULL, NULL, &one_second);
+		selret = select(pfd[0] + 1, &readfds, NULL, NULL, &one_second);
 
 	    if ((selret > 0) && FD_ISSET(pfd[0], &readfds)) {
 		/*
-		**	First get status, including length of address.  -BL, kw
-		*/
-		readret = read(pfd[0], &statuses, sizeof(statuses));
+		 * First get status, including length of address.  -BL, kw
+		 */
+		readret = readit(pfd[0], (char *) &statuses, sizeof(statuses));
 		if (readret == sizeof(statuses)) {
 		    h_errno = statuses.child_h_errno;
 		    set_errno(statuses.child_errno);
@@ -963,51 +1001,50 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 		    if (statuses.h_errno_valid) {
 			lynx_nsl_status = HT_H_ERRNO_VALID;
 			/*
-			 *  If something went wrong in the child process
-			 *  other than normal lookup errors, and it appears
-			 *  that we have enough info to know what went wrong,
-			 *  generate diagnostic output.
-			 *  ENOMEM observed on linux in processes constrained
-			 *  with ulimit.  It would be too unkind to abort
-			 *  the session, access to local files or through a
-			 *  proxy may still work. - kw
+			 * If something went wrong in the child process other
+			 * than normal lookup errors, and it appears that we
+			 * have enough info to know what went wrong, generate
+			 * diagnostic output.  ENOMEM observed on linux in
+			 * processes constrained with ulimit.  It would be too
+			 * unkind to abort the session, access to local files
+			 * or through a proxy may still work.  - kw
 			 */
 			if (
 #ifdef NETDB_INTERNAL		/* linux glibc: defined in netdb.h */
-			    (errno && h_errno == NETDB_INTERNAL) ||
+			       (errno && h_errno == NETDB_INTERNAL) ||
 #endif
-			    (errno == ENOMEM &&
-			     statuses.rehostentlen == 0 &&
-			     /* should probably be NETDB_INTERNAL if child
-				memory exhausted, but we may find that
-				h_errno remains unchanged. - kw */
-			     h_errno == -2)) {
+			       (errno == ENOMEM &&
+				statuses.rehostentlen == 0 &&
+			/* should probably be NETDB_INTERNAL if child
+			   memory exhausted, but we may find that
+			   h_errno remains unchanged. - kw */
+				h_errno == -2)) {
 #ifndef MULTINET
 			    HTInetStatus("CHILD gethostbyname");
 #endif
 			    HTAlert(LYStrerror(statuses.child_errno));
 			    if (errno == ENOMEM) {
 				/*
-				 *  Not much point in continuing, right?
-				 *  Fake a 'z', should shorten pointless
-				 *  guessing cycle. - kw
+				 * Not much point in continuing, right?  Fake a
+				 * 'z', should shorten pointless guessing
+				 * cycle.  - kw
 				 */
 				LYFakeZap(YES);
 			    }
 			}
 		    }
 #endif /* HAVE_H_ERRNO */
-		    if (statuses.rehostentlen > sizeof(struct hostent)) {
+		    if (statuses.rehostentlen > sizeof(LYNX_HOSTENT)) {
 			/*
-			**  Then get the full reorganized hostent.  -BL, kw
-			*/
-			readret = read(pfd[0], rehostent, statuses.rehostentlen);
+			 * Then get the full reorganized hostent.  -BL, kw
+			 */
+			readret = readit(pfd[0], rehostent, statuses.rehostentlen);
 #ifdef DEBUG_HOSTENT
-			dump_hostent("Read from pipe", (struct hostent *)rehostent);
+			dump_hostent("Read from pipe", (LYNX_HOSTENT *) rehostent);
 #endif
 			if (readret == (int) statuses.rehostentlen) {
 			    got_rehostent = 1;
-			    result_phost = (struct hostent *)rehostent;
+			    result_phost = (LYNX_HOSTENT *) rehostent;
 			    lynx_nsl_status = HT_OK;
 			} else if (!statuses.h_errno_valid) {
 			    lynx_nsl_status = HT_INTERNAL;
@@ -1017,8 +1054,8 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 		    lynx_nsl_status = HT_ERROR;
 		}
 		/*
-		**  Make sure child is cleaned up.  -BL
-		*/
+		 * Make sure child is cleaned up.  -BL
+		 */
 		if (!child_exited)
 		    waitret = waitpid(fpid, &waitstat, WNOHANG);
 		if (!WIFEXITED(waitstat) && !WIFSIGNALED(waitstat)) {
@@ -1029,28 +1066,28 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	    }
 
 	    /*
-	    **  Clean up if child exited before & no data received.  -BL
-	    */
+	     * Clean up if child exited before & no data received.  -BL
+	     */
 	    if (child_exited) {
 		waitret = waitpid(fpid, &waitstat, WNOHANG);
 		break;
 	    }
 	    /*
-	    **  If child exited, loop once more looking for data.  -BL
-	    */
+	     * If child exited, loop once more looking for data.  -BL
+	     */
 	    if ((waitret = waitpid(fpid, &waitstat, WNOHANG)) > 0) {
 		/*
-		**	Data will be arriving right now, so make sure we
-		**	don't short-circuit out for too many loops, and
-		**	skip the interrupt check.  -BL
-		*/
+		 * Data will be arriving right now, so make sure we don't
+		 * short-circuit out for too many loops, and skip the interrupt
+		 * check.  -BL
+		 */
 		child_exited = 1;
 		continue;
 	    }
 
 	    /*
-	    **  Abort if interrupt key pressed.
-	    */
+	     * Abort if interrupt key pressed.
+	     */
 	    if (HTCheckForInterrupt()) {
 		CTRACE((tfp, "LYGetHostByName: INTERRUPTED gethostbyname.\n"));
 		kill(fpid, SIGTERM);
@@ -1067,20 +1104,24 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 	}
 	if (waitret > 0) {
 	    if (WIFEXITED(waitstat)) {
-		CTRACE((tfp, "LYGetHostByName: NSL_FORK child %d exited, status 0x%x.\n",
-			(int)waitret, WEXITSTATUS(waitstat)));
+		CTRACE((tfp,
+			"LYGetHostByName: NSL_FORK child %d exited, status 0x%x.\n",
+			(int) waitret, WEXITSTATUS(waitstat)));
 	    } else if (WIFSIGNALED(waitstat)) {
-		CTRACE((tfp, "LYGetHostByName: NSL_FORK child %d got signal, status 0x%x!\n",
-		       (int)waitret, WTERMSIG(waitstat)));
+		CTRACE((tfp,
+			"LYGetHostByName: NSL_FORK child %d got signal, status 0x%x!\n",
+			(int) waitret, WTERMSIG(waitstat)));
 #ifdef WCOREDUMP
 		if (WCOREDUMP(waitstat)) {
-		    CTRACE((tfp, "LYGetHostByName: NSL_FORK child %d dumped core!\n",
-			   (int)waitret));
+		    CTRACE((tfp,
+			    "LYGetHostByName: NSL_FORK child %d dumped core!\n",
+			    (int) waitret));
 		}
 #endif /* WCOREDUMP */
 	    } else if (WIFSTOPPED(waitstat)) {
-		CTRACE((tfp, "LYGetHostByName: NSL_FORK child %d is stopped, status 0x%x!\n",
-			(int)waitret, WSTOPSIG(waitstat)));
+		CTRACE((tfp,
+			"LYGetHostByName: NSL_FORK child %d is stopped, status 0x%x!\n",
+			(int) waitret, WSTOPSIG(waitstat)));
 	    }
 	}
 	if (!got_rehostent) {
@@ -1091,25 +1132,28 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 
 #ifdef _WINDOWS_NSL
     {
-	HANDLE hThread, dwThreadID;
+	HANDLE hThread;
+	DWORD dwThreadID;
 
 #ifndef __CYGWIN__
 	if (!system_is_NT) {	/* for Windows9x */
 	    unsigned long t;
-	    t = (unsigned long)inet_addr(host);
-	    if ((int)t != -1)
-		phost = gethostbyaddr((char *)&t, sizeof (t), AF_INET);
+
+	    t = (unsigned long) inet_addr(host);
+	    if (t != INADDR_NONE)
+		gbl_phost = gethostbyaddr((char *) &t, sizeof(t), AF_INET);
 	    else
-		phost = gethostbyname(host);
+		gbl_phost = gethostbyname(host);
 	} else {		/* for Windows NT */
 #endif /* !__CYGWIN__ */
-	    phost = (struct hostent *) NULL;
+	    gbl_phost = (LYNX_HOSTENT *) NULL;
 	    donelookup = FALSE;
-	    hThread = CreateThread((void *)NULL, 4096UL,
-		(LPTHREAD_START_ROUTINE)_fork_func,
-		(void *)NULL, 0UL, (unsigned long *)&dwThreadID);
+	    WSASetLastError(WSAHOST_NOT_FOUND);
+
+	    hThread = CreateThread(NULL, 4096UL, _fork_func, host, 0UL,
+				   &dwThreadID);
 	    if (!hThread)
-		MessageBox((void *)NULL, "CreateThread",
+		MessageBox(NULL, "CreateThread",
 			   "CreateThread Failed", 0L);
 
 	    while (!donelookup) {
@@ -1117,8 +1161,8 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 		    /* Note that host is a character array and is not freed */
 		    /* to avoid possible subthread problems: */
 		    if (!CloseHandle(hThread)) {
-			MessageBox((void *)NULL,
-				   "CloseHandle","CloseHandle Failed", 0L);
+			MessageBox((void *) NULL,
+				   "CloseHandle", "CloseHandle Failed", 0L);
 		    }
 		    lynx_nsl_status = HT_INTERRUPTED;
 		    return NULL;
@@ -1127,9 +1171,9 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 #ifndef __CYGWIN__
 	}
 #endif /* !__CYGWIN__ */
-	if (phost) {
+	if (gbl_phost) {
 	    lynx_nsl_status = HT_OK;
-	    result_phost = phost;
+	    result_phost = gbl_phost;
 	} else {
 	    lynx_nsl_status = HT_ERROR;
 	    goto failed;
@@ -1138,7 +1182,8 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 
 #else /* !NSL_FORK, !_WINDOWS_NSL: */
     {
-	struct hostent  *phost;
+	LYNX_HOSTENT *phost;
+
 	phost = gethostbyname(host);	/* See netdb.h */
 #ifdef MVS
 	CTRACE((tfp, "LYGetHostByName: gethostbyname() returned %d\n", phost));
@@ -1161,36 +1206,31 @@ PUBLIC struct hostent * LYGetHostByName ARGS1(
 
     return result_phost;	/* OK */
 
-failed:
+  failed:
     CTRACE((tfp, "LYGetHostByName: Can't find internet node name `%s'.\n",
-		host));
+	    host));
     return NULL;
 }
 
-
 /*	Parse a network node address and port
-**	-------------------------------------
-**
-**  On entry,
-**	str	points to a string with a node name or number,
-**		with optional trailing colon and port number.
-**	soc_in	points to the binary internet or decnet address field.
-**
-**  On exit,
-**	*soc_in is filled in.  If no port is specified in str, that
-**		field is left unchanged in *soc_in.
-*/
+ *	-------------------------------------
+ *
+ *  On entry,
+ *	str	points to a string with a node name or number,
+ *		with optional trailing colon and port number.
+ *	soc_in	points to the binary internet or decnet address field.
+ *
+ *  On exit,
+ *	*soc_in is filled in.  If no port is specified in str, that
+ *		field is left unchanged in *soc_in.
+ */
 #ifndef INET6
-PRIVATE int HTParseInet ARGS2(
-	SockA *,	soc_in,
-	CONST char *,	str)
+static int HTParseInet(SockA * soc_in, const char *str)
 {
     char *port;
     int dotcount_ip = 0;	/* for dotted decimal IP addr */
     char *strptr;
-#ifndef _WINDOWS_NSL
     char *host = NULL;
-#endif /* _WINDOWS_NSL */
 
     if (!str) {
 	CTRACE((tfp, "HTParseInet: Can't parse `NULL'.\n"));
@@ -1201,30 +1241,27 @@ PRIVATE int HTParseInet ARGS2(
 	CTRACE((tfp, "HTParseInet: INTERRUPTED for '%s'.\n", str));
 	return -1;
     }
-#ifdef _WINDOWS_NSL
-    strncpy(host, str, sizeof(host));
-#else
     StrAllocCopy(host, str);	/* Make a copy we can mutilate */
-#endif /*  _WINDOWS_NSL */
     /*
-    **	Parse port number if present.
-    */
+     * Parse port number if present.
+     */
     if ((port = strchr(host, ':')) != NULL) {
 	*port++ = 0;		/* Chop off port */
 	strptr = port;
 	if (port[0] >= '0' && port[0] <= '9') {
 #ifdef UNIX
-	    soc_in->sin_port = (PortNumber)htons(strtol(port, &strptr, 10));
+	    soc_in->sin_port = (PortNumber) htons(strtol(port, &strptr, 10));
 #else /* VMS: */
 #ifdef DECNET
-	    soc_in->sdn_objnum = (unsigned char)(strtol(port, &strptr, 10));
+	    soc_in->sdn_objnum = (unsigned char) (strtol(port, &strptr, 10));
 #else
-	    soc_in->sin_port = htons((PortNumber)strtol(port, &strptr, 10));
+	    soc_in->sin_port = htons((PortNumber) strtol(port, &strptr, 10));
 #endif /* Decnet */
 #endif /* Unix vs. VMS */
-#ifdef SUPPRESS		/* 1. crashes!?!.  2. URL syntax has number not name */
+#ifdef SUPPRESS			/* 1. crashes!?!.  2. URL syntax has number not name */
 	} else {
-	    struct servent * serv = getservbyname(port, (char*)0);
+	    struct servent *serv = getservbyname(port, (char *) 0);
+
 	    if (serv) {
 		soc_in->sin_port = serv->s_port;
 	    } else {
@@ -1233,26 +1270,24 @@ PRIVATE int HTParseInet ARGS2(
 #endif /* SUPPRESS */
 	}
 	if (strptr && *strptr != '\0') {
-#ifndef _WINDOWS_NSL
 	    FREE(host);
-#endif /* _WINDOWS_NSL */
 	    HTAlwaysAlert(NULL, gettext("Address has invalid port"));
 	    return -1;
 	}
     }
-
 #ifdef DECNET
     /*
-    **	Read Decnet node name. @@ Should know about DECnet addresses, but
-    **	it's probably worth waiting until the Phase transition from IV to V.
-    */
-    soc_in->sdn_nam.n_len = min(DN_MAXNAML, strlen(host));  /* <=6 in phase 4 */
+     * Read Decnet node name.  @@ Should know about DECnet addresses, but it's
+     * probably worth waiting until the Phase transition from IV to V.
+     */
+    soc_in->sdn_nam.n_len = min(DN_MAXNAML, strlen(host));	/* <=6 in phase 4 */
     strncpy(soc_in->sdn_nam.n_name, host, soc_in->sdn_nam.n_len + 1);
-    CTRACE((tfp, "DECnet: Parsed address as object number %d on host %.6s...\n",
-		soc_in->sdn_objnum, host));
-#else  /* parse Internet host: */
+    CTRACE((tfp,
+	    "DECnet: Parsed address as object number %d on host %.6s...\n",
+	    soc_in->sdn_objnum, host));
+#else /* parse Internet host: */
 
-    if (*host >= '0' && *host <= '9') {   /* Test for numeric node address: */
+    if (*host >= '0' && *host <= '9') {		/* Test for numeric node address: */
 	strptr = host;
 	while (*strptr) {
 	    if (*strptr == '.') {
@@ -1268,22 +1303,20 @@ PRIVATE int HTParseInet ARGS2(
     }
 
     /*
-    **	Parse host number if present.
-    */
-    if (dotcount_ip == 3)   /* Numeric node address: */
+     * Parse host number if present.
+     */
+    if (dotcount_ip == 3)	/* Numeric node address: */
     {
 #ifdef DGUX_OLD
-	soc_in->sin_addr.s_addr = inet_addr(host).s_addr; /* See arpa/inet.h */
+	soc_in->sin_addr.s_addr = inet_addr(host).s_addr;	/* See arpa/inet.h */
 #else
 #ifdef GUSI
-	soc_in->sin_addr = inet_addr(host);		/* See netinet/in.h */
+	soc_in->sin_addr = inet_addr(host);	/* See netinet/in.h */
 #else
 #ifdef HAVE_INET_ATON
 	if (!inet_aton(host, &(soc_in->sin_addr))) {
 	    CTRACE((tfp, "inet_aton(%s) returns error\n", host));
-#ifndef _WINDOWS_NSL
 	    FREE(host);
-#endif /* _WINDOWS_NSL */
 	    return -1;
 	}
 #else
@@ -1291,92 +1324,75 @@ PRIVATE int HTParseInet ARGS2(
 #endif /* HAVE_INET_ATON */
 #endif /* GUSI */
 #endif /* DGUX_OLD */
-#ifndef _WINDOWS_NSL
 	FREE(host);
-#endif /* _WINDOWS_NSL */
-    } else
-    {			    /* Alphanumeric node name: */
+    } else {			/* Alphanumeric node name: */
 
-#ifdef MVS	/* Outstanding problem with crash in MVS gethostbyname */
+#ifdef MVS			/* Outstanding problem with crash in MVS gethostbyname */
 	CTRACE((tfp, "HTParseInet: Calling LYGetHostByName(%s)\n", host));
 #endif /* MVS */
 
 #ifdef _WINDOWS_NSL
-	phost = LYGetHostByName(host);	/* See above */
-	if (!phost) goto failed;
-	memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length);
+	gbl_phost = LYGetHostByName(host);	/* See above */
+	if (!gbl_phost)
+	    goto failed;
+	memcpy((void *) &soc_in->sin_addr, gbl_phost->h_addr_list[0], gbl_phost->h_length);
 #else /* !_WINDOWS_NSL */
 	{
-	    struct hostent  *phost;
+	    LYNX_HOSTENT *phost;
+
 	    phost = LYGetHostByName(host);	/* See above */
 
-	    if (!phost) goto failed;
-#if defined(VMS) && defined(CMU_TCP)
-	    /*
-	    **  In LIBCMU, phost->h_length contains not the length of one address
-	    **  (four bytes) but the number of bytes in *h_addr, i.e., some multiple
-	    **  of four.  Thus we need to hard code the value here, and remember to
-	    **  change it if/when IP addresses change in size. :-(	LIBCMU is no
-	    **  longer supported, and CMU users are encouraged to obtain and use
-	    **  SOCKETSHR/NETLIB instead. - S. Bjorndahl
-	    */
-	    memcpy((void *)&soc_in->sin_addr, phost->h_addr, 4);
-#else
-	    if (!phost) goto failed;
+	    if (!phost)
+		goto failed;
+	    if (!phost)
+		goto failed;
 	    if (phost->h_length != sizeof soc_in->sin_addr) {
 		HTAlwaysAlert(host, gettext("Address length looks invalid"));
 	    }
-	    memcpy((void *)&soc_in->sin_addr, phost->h_addr, phost->h_length);
-#endif /* VMS && CMU_TCP */
+	    memcpy((void *) &soc_in->sin_addr, phost->h_addr_list[0], phost->h_length);
 	}
 #endif /* _WINDOWS_NSL */
 
-#ifndef _WINDOWS_NSL
 	FREE(host);
-#endif /* _WINDOWS_NSL */
+    }				/* Alphanumeric node name */
 
-    }	/* Alphanumeric node name */
-
-    CTRACE((tfp, "HTParseInet: Parsed address as port %d, IP address %d.%d.%d.%d\n",
-		(int)ntohs(soc_in->sin_port),
-		(int)*((unsigned char *)(&soc_in->sin_addr)+0),
-		(int)*((unsigned char *)(&soc_in->sin_addr)+1),
-		(int)*((unsigned char *)(&soc_in->sin_addr)+2),
-		(int)*((unsigned char *)(&soc_in->sin_addr)+3)));
-#endif	/* Internet vs. Decnet */
+    CTRACE((tfp,
+	    "HTParseInet: Parsed address as port %d, IP address %d.%d.%d.%d\n",
+	    (int) ntohs(soc_in->sin_port),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 0),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 1),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 2),
+	    (int) *((unsigned char *) (&soc_in->sin_addr) + 3)));
+#endif /* Internet vs. Decnet */
 
-    return 0;	/* OK */
+    return 0;			/* OK */
 
-failed:
+  failed:
     CTRACE((tfp, "HTParseInet: Can't find internet node name `%s'.\n",
-		host));
-#ifndef _WINDOWS_NSL
+	    host));
     FREE(host);
-#endif /* _WINDOWS_NSL */
     switch (lynx_nsl_status) {
-	case HT_NOT_ACCEPTABLE:
-	case HT_INTERRUPTED:
-	    return lynx_nsl_status;
-	default:
+    case HT_NOT_ACCEPTABLE:
+    case HT_INTERRUPTED:
+	return lynx_nsl_status;
+    default:
 	return -1;
     }
 }
 #endif /* !INET6 */
 
 #ifdef INET6
-PRIVATE struct addrinfo *
-HTGetAddrInfo ARGS2(
-    CONST char *, str,
-    CONST int, defport)
+static LYNX_ADDRINFO *HTGetAddrInfo(const char *str,
+				    const int defport)
 {
-    struct addrinfo hints, *res;
+    LYNX_ADDRINFO hints, *res;
     int error;
     char *p;
-    char *s;
+    char *s = NULL;
     char *host, *port;
     char pbuf[80];
 
-    s = strdup(str);
+    StrAllocCopy(s, str);
 
     if (s[0] == '[' && (p = strchr(s, ']')) != NULL) {
 	*p++ = '\0';
@@ -1403,43 +1419,46 @@ HTGetAddrInfo ARGS2(
 	res = NULL;
     }
 
+    free(s);
     return res;
 }
 #endif /* INET6 */
 
 #ifdef LY_FIND_LEAKS
 /*	Free our name for the host on which we are - FM
-**	-------------------------------------------
-**
-*/
-PRIVATE void free_HTTCP_hostname NOARGS
+ *	-------------------------------------------
+ *
+ */
+static void free_HTTCP_hostname(void)
 {
     FREE(hostname);
 }
 #endif /* LY_FIND_LEAKS */
 
 /*	Derive the name of the host on which we are
-**	-------------------------------------------
-**
-*/
-PRIVATE void get_host_details NOARGS
+ *	-------------------------------------------
+ *
+ */
+static void get_host_details(void)
 {
-    char name[MAXHOSTNAMELEN+1];	/* The name of this host */
+    char name[MAXHOSTNAMELEN + 1];	/* The name of this host */
+
 #ifdef UCX
-    char *domain_name;			/* The name of this host domain */
+    char *domain_name;		/* The name of this host domain */
 #endif /* UCX */
-#ifdef NEED_HOST_ADDRESS		/* no -- needs name server! */
+#ifdef NEED_HOST_ADDRESS	/* no -- needs name server! */
 #ifdef INET6
-    struct addrinfo hints, *res;
+    LYNX_ADDRINFO hints, *res;
     int error;
+
 #else
-    struct hostent * phost;		/* Pointer to host -- See netdb.h */
+    LYNX_HOSTENT *phost;	/* Pointer to host -- See netdb.h */
 #endif /* INET6 */
 #endif /* NEED_HOST_ADDRESS */
     int namelength = sizeof(name);
 
     if (hostname)
-	return;				/* Already done */
+	return;			/* Already done */
     gethostname(name, namelength);	/* Without domain */
     StrAllocCopy(hostname, name);
 #ifdef LY_FIND_LEAKS
@@ -1447,10 +1466,10 @@ PRIVATE void get_host_details NOARGS
 #endif
 #ifdef UCX
     /*
-    **	UCX doesn't give the complete domain name.
-    **	Get rest from UCX$BIND_DOM logical.
-    */
-    if (strchr(hostname,'.') == NULL) {		  /* Not full address */
+     * UCX doesn't give the complete domain name.  Get rest from UCX$BIND_DOM
+     * logical.
+     */
+    if (strchr(hostname, '.') == NULL) {	/* Not full address */
 	domain_name = LYGetEnv("UCX$BIND_DOMAIN");
 	if (domain_name == NULL)
 	    domain_name = LYGetEnv("TCPIP$BIND_DOMAIN");
@@ -1458,12 +1477,12 @@ PRIVATE void get_host_details NOARGS
 	    StrAllocCat(hostname, ".");
 	    StrAllocCat(hostname, domain_name);
 	}
-     }
+    }
 #endif /* UCX */
     CTRACE((tfp, "TCP: Local host name is %s\n", hostname));
 
-#ifndef DECNET	/* Decnet ain't got no damn name server 8#OO */
-#ifdef NEED_HOST_ADDRESS		/* no -- needs name server! */
+#ifndef DECNET			/* Decnet ain't got no damn name server 8#OO */
+#ifdef NEED_HOST_ADDRESS	/* no -- needs name server! */
 #ifdef INET6
     memset(&hints, 0, sizeof(hints));
     hints.ai_family = PF_UNSPEC;
@@ -1474,7 +1493,7 @@ PRIVATE void get_host_details NOARGS
 	CTRACE((tfp, "TCP: %s: `%s'\n", gai_strerror(error), name));
 	if (res)
 	    freeaddrinfo(res);
-	return;  /* Fail! */
+	return;			/* Fail! */
     }
     StrAllocCopy(hostname, res->ai_canonname);
     memcpy(&HTHostAddress, res->ai_addr, res->ai_addrlen);
@@ -1482,82 +1501,84 @@ PRIVATE void get_host_details NOARGS
 #else
     phost = gethostbyname(name);	/* See netdb.h */
     if (!OK_HOST(phost)) {
-	CTRACE((tfp, "TCP: Can't find my own internet node address for `%s'!!\n",
-		    name));
-	return;  /* Fail! */
+	CTRACE((tfp,
+		"TCP: Can't find my own internet node address for `%s'!!\n",
+		name));
+	return;			/* Fail! */
     }
     StrAllocCopy(hostname, phost->h_name);
-    memcpy(&HTHostAddress, &phost->h_addr, phost->h_length);
+    memcpy(&HTHostAddress, &phost->h_addr_list[0], phost->h_length);
 #endif /* INET6 */
     CTRACE((tfp, "     Name server says that I am `%s' = %s\n",
-		hostname, HTInetString(&HTHostAddress)));
+	    hostname, HTInetString(&HTHostAddress)));
 #endif /* NEED_HOST_ADDRESS */
 
 #endif /* !DECNET */
 }
 
-PUBLIC CONST char * HTHostName NOARGS
+const char *HTHostName(void)
 {
     get_host_details();
     return hostname;
 }
 
 #ifndef MULTINET		/* SOCKET_ERRNO != errno ? */
-#if !defined(UCX) || !defined(VAXC) /* errno not modifiable ? */
-#define SOCKET_DEBUG_TRACE    /* show errno status after some system calls */
-#endif  /* UCX && VAXC */
+#if !defined(UCX) || !defined(VAXC)	/* errno not modifiable ? */
+#define SOCKET_DEBUG_TRACE	/* show errno status after some system calls */
+#endif /* UCX && VAXC */
 #endif /* MULTINET */
 /*
-**  Interruptible connect as implemented for Mosaic by Marc Andreesen
-**  and hacked in for Lynx years ago by Lou Montulli, and further
-**  modified over the years by numerous Lynx lovers. - FM
-*/
-PUBLIC int HTDoConnect ARGS4(
-	CONST char *,	url,
-	char *,		protocol,
-	int,		default_port,
-	int *,		s)
+ *  Interruptible connect as implemented for Mosaic by Marc Andreesen
+ *  and hacked in for Lynx years ago by Lou Montulli, and further
+ *  modified over the years by numerous Lynx lovers. - FM
+ */
+int HTDoConnect(const char *url,
+		const char *protocol,
+		int default_port,
+		int *s)
 {
     int status = 0;
     char *line = NULL;
     char *p1 = NULL;
     char *at_sign = NULL;
     char *host = NULL;
+
 #ifdef INET6
-    struct addrinfo *res = 0, *res0 = 0;
+    LYNX_ADDRINFO *res = 0, *res0 = 0;
+
 #else
     struct sockaddr_in soc_address;
     struct sockaddr_in *soc_in = &soc_address;
 
     /*
-    **	Set up defaults.
-    */
+     * Set up defaults.
+     */
     memset(soc_in, 0, sizeof(*soc_in));
     soc_in->sin_family = AF_INET;
     soc_in->sin_port = htons((PortNumber) default_port);
 #endif /* INET6 */
 
     /*
-    **	Get node name and optional port number.
-    */
+     * Get node name and optional port number.
+     */
     p1 = HTParse(url, "", PARSE_HOST);
     if ((at_sign = strchr(p1, '@')) != NULL) {
 	/*
-	**  If there's an @ then use the stuff after it as a hostname.
-	*/
+	 * If there's an @ then use the stuff after it as a hostname.
+	 */
 	StrAllocCopy(host, (at_sign + 1));
     } else {
 	StrAllocCopy(host, p1);
     }
     FREE(p1);
 
-    HTSprintf0 (&line, "%s%s", WWW_FIND_MESSAGE, host);
-    _HTProgress (line);
+    HTSprintf0(&line, "%s%s", WWW_FIND_MESSAGE, host);
+    _HTProgress(line);
 #ifdef INET6
     /* HTParseInet() is useless! */
     res0 = HTGetAddrInfo(host, default_port);
     if (res0 == NULL) {
-	HTSprintf0 (&line, gettext("Unable to locate remote host %s."), host);
+	HTSprintf0(&line, gettext("Unable to locate remote host %s."), host);
 	_HTProgress(line);
 	FREE(host);
 	FREE(line);
@@ -1568,14 +1589,14 @@ PUBLIC int HTDoConnect ARGS4(
     if (status) {
 	if (status != HT_INTERRUPTED) {
 	    if (status == HT_NOT_ACCEPTABLE) {
-		/*  Not HTProgress, so warning won't be overwritten
-		 *  immediately; but not HTAlert, because typically
-		 *  there will be other alerts from the callers. - kw
+		/* Not HTProgress, so warning won't be overwritten immediately;
+		 * but not HTAlert, because typically there will be other
+		 * alerts from the callers.  - kw
 		 */
 		HTUserMsg2(gettext("Invalid hostname %s"), host);
 	    } else {
-		HTSprintf0 (&line,
-			 gettext("Unable to locate remote host %s."), host);
+		HTSprintf0(&line,
+			   gettext("Unable to locate remote host %s."), host);
 		_HTProgress(line);
 	    }
 	    status = HT_NO_DATA;
@@ -1586,284 +1607,290 @@ PUBLIC int HTDoConnect ARGS4(
     }
 #endif /* INET6 */
 
-    HTSprintf0 (&line, gettext("Making %s connection to %s"), protocol, host);
-    _HTProgress (line);
+    HTSprintf0(&line, gettext("Making %s connection to %s"), protocol, host);
+    _HTProgress(line);
     FREE(host);
     FREE(line);
 
     /*
-    **	Now, let's get a socket set up from the server for the data.
-    */
-#ifdef INET6
+     * Now, let's get a socket set up from the server for the data.
+     */
+#ifndef INET6
+    *s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    if (*s == -1) {
+	HTAlert(gettext("socket failed."));
+	return HT_NO_DATA;
+    }
+#else
     for (res = res0; res; res = res->ai_next) {
 	*s = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 	if (*s == -1) {
 	    char hostbuf[1024], portbuf[1024];
+
 	    getnameinfo(res->ai_addr, res->ai_addrlen,
-		    hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf),
-		    NI_NUMERICHOST|NI_NUMERICSERV);
-	    HTSprintf0 (&line, gettext("socket failed: family %d addr %s port %s."),
-		    res->ai_family, hostbuf, portbuf);
-	    _HTProgress (line);
+			hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf),
+			NI_NUMERICHOST | NI_NUMERICSERV);
+	    HTSprintf0(&line,
+		       gettext("socket failed: family %d addr %s port %s."),
+		       res->ai_family, hostbuf, portbuf);
+	    _HTProgress(line);
 	    FREE(line);
 	    continue;
 	}
-#else
-    *s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
-    if (*s == -1) {
-	HTAlert(gettext("socket failed."));
-	return HT_NO_DATA;
-    }
 #endif /* INET6 */
 
 #if !defined(DOSPATH) || defined(__DJGPP__)
 #if !defined(NO_IOCTL) || defined(USE_FCNTL)
-    /*
-    **	Make the socket non-blocking, so the connect can be canceled.
-    **	This means that when we issue the connect we should NOT
-    **	have to wait for the accept on the other end.
-    */
-    {
+	/*
+	 * Make the socket non-blocking, so the connect can be canceled.  This
+	 * means that when we issue the connect we should NOT have to wait for
+	 * the accept on the other end.
+	 */
+	{
 #ifdef USE_FCNTL
-	int ret = fcntl(*s, F_SETFL, O_NONBLOCK);
+	    int ret = fcntl(*s, F_SETFL, O_NONBLOCK);
+
 #else
-	int val = 1;
-	int ret = IOCTL(*s, FIONBIO, &val);
+	    int val = 1;
+	    int ret = IOCTL(*s, FIONBIO, &val);
 #endif /* USE_FCNTL */
-	if (ret == -1)
-	    _HTProgress(gettext("Could not make connection non-blocking."));
-    }
+	    if (ret == -1)
+		_HTProgress(gettext("Could not make connection non-blocking."));
+	}
 #endif /* !NO_IOCTL || USE_FCNTL */
 #endif /* !DOSPATH || __DJGPP__ */
 
-    /*
-    **	Issue the connect.  Since the server can't do an instantaneous
-    **	accept and we are non-blocking, this will almost certainly return
-    **	a negative status.
-    */
+	/*
+	 * Issue the connect.  Since the server can't do an instantaneous
+	 * accept and we are non-blocking, this will almost certainly return a
+	 * negative status.
+	 */
 #ifdef SOCKS
-    if (socks_flag) {
+	if (socks_flag) {
 #ifdef INET6
-	status = Rconnect(*s, res->ai_addr, res->ai_addrlen);
+	    status = Rconnect(*s, res->ai_addr, res->ai_addrlen);
 #else
-	status = Rconnect(*s, (struct sockaddr*)&soc_address,
-			  sizeof(soc_address));
+	    status = Rconnect(*s, (struct sockaddr *) &soc_address,
+			      sizeof(soc_address));
+#ifndef SHORTENED_RBIND
+	    socks_bind_remoteAddr = soc_address.sin_addr.s_addr;
+#endif
 #endif /* INET6 */
-	/*
-	**  For long Rbind.
-	*/
-	socks_bind_remoteAddr = soc_address.sin_addr.s_addr;
-    } else
+	} else
 #endif /* SOCKS */
 #ifdef INET6
-    status = connect(*s, res->ai_addr, res->ai_addrlen);
+	    status = connect(*s, res->ai_addr, res->ai_addrlen);
 #else
-    status = connect(*s, (struct sockaddr*)&soc_address, sizeof(soc_address));
+	    status = connect(*s, (struct sockaddr *) &soc_address, sizeof(soc_address));
 #endif /* INET6 */
 
-    /*
-    **	According to the Sun man page for connect:
-    **	   EINPROGRESS	       The socket is non-blocking and the  con-
-    **			       nection cannot be completed immediately.
-    **			       It is possible to select(2) for	comple-
-    **			       tion  by  selecting the socket for writ-
-    **			       ing.
-    **	According to the Motorola SVR4 man page for connect:
-    **	   EAGAIN	       The socket is non-blocking and the  con-
-    **			       nection cannot be completed immediately.
-    **			       It is possible to select for  completion
-    **			       by  selecting  the  socket  for writing.
-    **			       However, this is only  possible	if  the
-    **			       socket  STREAMS	module	is  the topmost
-    **			       module on  the  protocol  stack	with  a
-    **			       write  service  procedure.  This will be
-    **			       the normal case.
-    */
-    if ((status < 0) &&
-	(SOCKET_ERRNO == EINPROGRESS
+	/*
+	 * According to the Sun man page for connect:
+	 *  EINPROGRESS         The socket is non-blocking and the  con-
+	 *                      nection cannot be completed immediately.
+	 *                      It is possible to select(2) for  comple-
+	 *                      tion  by  selecting the socket for writ-
+	 *                      ing.
+	 * According to the Motorola SVR4 man page for connect:
+	 *  EAGAIN              The socket is non-blocking and the  con-
+	 *                      nection cannot be completed immediately.
+	 *                      It is possible to select for  completion
+	 *                      by  selecting  the  socket  for writing.
+	 *                      However, this is only  possible  if  the
+	 *                      socket  STREAMS  module  is  the topmost
+	 *                      module on  the  protocol  stack  with  a
+	 *                      write  service  procedure.  This will be
+	 *                      the normal case.
+	 */
+	if ((status < 0) &&
+	    (SOCKET_ERRNO == EINPROGRESS
 #ifdef EAGAIN
-	 || SOCKET_ERRNO == EAGAIN
+	     || SOCKET_ERRNO == EAGAIN
 #endif
-	 )) {
-	struct timeval select_timeout;
-	int ret;
-	int tries=0;
+	    )) {
+	    struct timeval select_timeout;
+	    int ret;
+	    int tries = 0;
 
 #ifdef SOCKET_DEBUG_TRACE
-	HTInetStatus("this socket's first connect");
+	    HTInetStatus("this socket's first connect");
 #endif /* SOCKET_DEBUG_TRACE */
-	ret = 0;
-	while (ret <= 0) {
-	    fd_set writefds;
+	    ret = 0;
+	    while (ret <= 0) {
+		fd_set writefds;
 
-	    /*
-	    **	Protect against an infinite loop.
-	    */
-	    if ((tries++/10) >= connect_timeout) {
-		HTAlert(gettext("Connection failed (too many retries)."));
+		/*
+		 * Protect against an infinite loop.
+		 */
+		if ((tries++ / 10) >= connect_timeout) {
+		    HTAlert(gettext("Connection failed (too many retries)."));
 #ifdef INET6
-		FREE(line);
-		if (res0)
-		    freeaddrinfo(res0);
+		    FREE(line);
+		    if (res0)
+			freeaddrinfo(res0);
 #endif /* INET6 */
-		return HT_NO_DATA;
-	    }
-
+		    return HT_NO_DATA;
+		}
 #ifdef _WINDOWS_NSL
-	    select_timeout.tv_sec = connect_timeout;
-	    select_timeout.tv_usec = 0;
+		select_timeout.tv_sec = connect_timeout;
+		select_timeout.tv_usec = 0;
 #else
-	    select_timeout.tv_sec = 0;
-	    select_timeout.tv_usec = 100000;
+		select_timeout.tv_sec = 0;
+		select_timeout.tv_usec = 100000;
 #endif /* _WINDOWS_NSL */
-	    FD_ZERO(&writefds);
-	    FD_SET((unsigned) *s, &writefds);
+		FD_ZERO(&writefds);
+		FD_SET((unsigned) *s, &writefds);
 #ifdef SOCKS
-	    if (socks_flag)
-		ret = Rselect((unsigned)*s + 1, NULL,
-			      (void *)&writefds, NULL, &select_timeout);
-	    else
+		if (socks_flag)
+		    ret = Rselect((unsigned) *s + 1, NULL,
+				  &writefds, NULL, &select_timeout);
+		else
 #endif /* SOCKS */
-	    ret = select((unsigned)*s + 1, NULL, (void *)&writefds, NULL, &select_timeout);
+		    ret = select((unsigned) *s + 1,
+				 NULL,
+				 &writefds,
+				 NULL,
+				 &select_timeout);
 
 #ifdef SOCKET_DEBUG_TRACE
-	    if (tries == 1) {
-		HTInetStatus("this socket's first select");
-	    }
+		if (tries == 1) {
+		    HTInetStatus("this socket's first select");
+		}
 #endif /* SOCKET_DEBUG_TRACE */
-	    /*
-	    **  If we suspend, then it is possible that select will be
-	    **  interrupted.  Allow for this possibility. - JED
-	    */
-	    if ((ret == -1) && (errno == EINTR))
-		continue;
+		/*
+		 * If we suspend, then it is possible that select will be
+		 * interrupted.  Allow for this possibility.  - JED
+		 */
+		if ((ret == -1) && (errno == EINTR))
+		    continue;
 
 #ifdef SOCKET_DEBUG_TRACE
-	    if (ret < 0) {
-		HTInetStatus("failed select");
-	    }
+		if (ret < 0) {
+		    HTInetStatus("failed select");
+		}
 #endif /* SOCKET_DEBUG_TRACE */
-	    /*
-	    **	Again according to the Sun and Motorola man pages for connect:
-	    **	   EALREADY	       The socket is non-blocking and a  previ-
-	    **			       ous  connection attempt has not yet been
-	    **			       completed.
-	    **	Thus if the SOCKET_ERRNO is NOT EALREADY we have a real error,
-	    **	and should break out here and return that error.
-	    **	Otherwise if it is EALREADY keep on trying to complete the
-	    **	connection.
-	    */
-	    if ((ret < 0) && (SOCKET_ERRNO != EALREADY)) {
-		status = ret;
-		break;
-	    } else if (ret > 0) {
 		/*
-		**  Extra check here for connection success, if we try to
-		**  connect again, and get EISCONN, it means we have a
-		**  successful connection.  But don't check with SOCKS.
-		*/
+		 * Again according to the Sun and Motorola man pages for
+		 * connect:
+		 *  EALREADY    The socket is non-blocking and a  previ-
+		 *              ous  connection attempt has not yet been
+		 *              completed.
+		 * Thus if the SOCKET_ERRNO is NOT EALREADY we have a real
+		 * error, and should break out here and return that error.
+		 * Otherwise if it is EALREADY keep on trying to complete the
+		 * connection.
+		 */
+		if ((ret < 0) && (SOCKET_ERRNO != EALREADY)) {
+		    status = ret;
+		    break;
+		} else if (ret > 0) {
+		    /*
+		     * Extra check here for connection success, if we try to
+		     * connect again, and get EISCONN, it means we have a
+		     * successful connection.  But don't check with SOCKS.
+		     */
 #ifdef SOCKS
-		if (socks_flag) {
-		    status = 0;
-		} else {
+		    if (socks_flag) {
+			status = 0;
+		    } else {
 #endif /* SOCKS */
 #ifdef INET6
-		status = connect(*s, res->ai_addr, res->ai_addrlen);
+			status = connect(*s, res->ai_addr, res->ai_addrlen);
 #else
-		status = connect(*s, (struct sockaddr*)&soc_address,
-				 sizeof(soc_address));
+			status = connect(*s, (struct sockaddr *) &soc_address,
+					 sizeof(soc_address));
 #endif /* INET6 */
 #ifdef UCX
-		/*
-		**  A UCX feature: Instead of returning EISCONN
-		**		 UCX returns EADDRINUSE.
-		**  Test for this status also.
-		*/
-		if ((status < 0) && ((SOCKET_ERRNO == EISCONN) ||
-				     (SOCKET_ERRNO == EADDRINUSE)))
+			/*
+			 * A UCX feature:  Instead of returning EISCONN UCX
+			 * returns EADDRINUSE.  Test for this status also.
+			 */
+			if ((status < 0) && ((SOCKET_ERRNO == EISCONN) ||
+					     (SOCKET_ERRNO == EADDRINUSE)))
 #else
-		if ((status < 0) && (SOCKET_ERRNO == EISCONN))
+			if ((status < 0) && (SOCKET_ERRNO == EISCONN))
 #endif /* UCX */
-		{
-		    status = 0;
-		}
+			{
+			    status = 0;
+			}
 
-		if (status && (SOCKET_ERRNO == EALREADY)) /* new stuff LJM */
-		    ret = 0; /* keep going */
-		else {
+			if (status && (SOCKET_ERRNO == EALREADY))	/* new stuff LJM */
+			    ret = 0;	/* keep going */
+			else {
 #ifdef SOCKET_DEBUG_TRACE
-		    if (status < 0) {
-			HTInetStatus("confirm-ready connect");
-		    }
+			    if (status < 0) {
+				HTInetStatus("confirm-ready connect");
+			    }
 #endif /* SOCKET_DEBUG_TRACE */
-		    break;
-		}
+			    break;
+			}
 #ifdef SOCKS
-		}
+		    }
 #endif /* SOCKS */
-	    }
+		}
 #ifdef SOCKS
-	    else if (!socks_flag)
+		else if (!socks_flag)
 #else
-	    else
+		else
 #endif /* SOCKS */
-	    {
-		/*
-		**  The select says we aren't ready yet.  Try to connect
-		**  again to make sure.  If we don't get EALREADY or EISCONN,
-		**  something has gone wrong.  Break out and report it.
-		**
-		**  For some reason, SVR4 returns EAGAIN here instead of
-		**  EALREADY, even though the man page says it should be
-		**  EALREADY.
-		**
-		**  For some reason, UCX pre 3 apparently returns
-		**  errno = 18242 instead the EALREADY or EISCONN.
-		*/
+		{
+		    /*
+		     * The select says we aren't ready yet.  Try to connect
+		     * again to make sure.  If we don't get EALREADY or
+		     * EISCONN, something has gone wrong.  Break out and report
+		     * it.
+		     *
+		     * For some reason, SVR4 returns EAGAIN here instead of
+		     * EALREADY, even though the man page says it should be
+		     * EALREADY.
+		     *
+		     * For some reason, UCX pre 3 apparently returns errno =
+		     * 18242 instead of EALREADY or EISCONN.
+		     */
 #ifdef INET6
-		status = connect(*s, res->ai_addr, res->ai_addrlen);
+		    status = connect(*s, res->ai_addr, res->ai_addrlen);
 #else
-		status = connect(*s, (struct sockaddr*)&soc_address,
-				 sizeof(soc_address));
+		    status = connect(*s, (struct sockaddr *) &soc_address,
+				     sizeof(soc_address));
 #endif /* INET6 */
-		if ((status < 0) &&
-		    (SOCKET_ERRNO != EALREADY
+		    if ((status < 0) &&
+			(SOCKET_ERRNO != EALREADY
 #ifdef EAGAIN
-		    && SOCKET_ERRNO != EAGAIN
+			 && SOCKET_ERRNO != EAGAIN
 #endif
-		    ) &&
+			) &&
 #ifdef UCX
-		    (SOCKET_ERRNO != 18242) &&
+			(SOCKET_ERRNO != 18242) &&
 #endif /* UCX */
-		    (SOCKET_ERRNO != EISCONN)) {
+			(SOCKET_ERRNO != EISCONN)) {
 #ifdef SOCKET_DEBUG_TRACE
-		    HTInetStatus("confirm-not-ready connect");
+			HTInetStatus("confirm-not-ready connect");
 #endif /* SOCKET_DEBUG_TRACE */
-		    break;
+			break;
+		    }
 		}
-	    }
-	    if (HTCheckForInterrupt()) {
-		CTRACE((tfp, "*** INTERRUPTED in middle of connect.\n"));
-		status = HT_INTERRUPTED;
+		if (HTCheckForInterrupt()) {
+		    CTRACE((tfp, "*** INTERRUPTED in middle of connect.\n"));
+		    status = HT_INTERRUPTED;
 #ifdef _WINDOWS
-		WSASetLastError(EINTR);
+		    WSASetLastError(EINTR);
 #else
-		SOCKET_ERRNO = EINTR;
+		    SOCKET_ERRNO = EINTR;
 #endif
-		break;
+		    break;
+		}
 	    }
 	}
-    }
 #ifdef SOCKET_DEBUG_TRACE
-    else if (status < 0) {
-	HTInetStatus("this socket's first and only connect");
-    }
+	else if (status < 0) {
+	    HTInetStatus("this socket's first and only connect");
+	}
 #endif /* SOCKET_DEBUG_TRACE */
 #ifdef INET6
 	if (status < 0) {
-		NETCLOSE(*s);
-		*s = -1;
-		continue;
+	    NETCLOSE(*s);
+	    *s = -1;
+	    continue;
 	}
 	break;
     }
@@ -1876,19 +1903,20 @@ PUBLIC int HTDoConnect ARGS4(
 #endif /* INET6 */
     {
 	/*
-	**  The connect attempt failed or was interrupted,
-	**  so close up the socket.
-	*/
+	 * The connect attempt failed or was interrupted, so close up the
+	 * socket.
+	 */
 	NETCLOSE(*s);
     }
 #if !defined(DOSPATH) || defined(__DJGPP__)
 #if !defined(NO_IOCTL) || defined(USE_FCNTL)
     else {
 	/*
-	**  Make the socket blocking again on good connect.
-	*/
+	 * Make the socket blocking again on good connect.
+	 */
 #ifdef USE_FCNTL
 	int ret = fcntl(*s, F_SETFL, 0);
+
 #else
 	int val = 0;
 	int ret = IOCTL(*s, FIONBIO, &val);
@@ -1908,30 +1936,30 @@ PUBLIC int HTDoConnect ARGS4(
 }
 
 /*
-**  This is so interruptible reads can be implemented cleanly.
-*/
-PUBLIC int HTDoRead ARGS3(
-	int,		fildes,
-	void *,		buf,
-	unsigned,	nbyte)
+ *  This is so interruptible reads can be implemented cleanly.
+ */
+int HTDoRead(int fildes,
+	     void *buf,
+	     unsigned nbyte)
 {
     int ready, ret;
     fd_set readfds;
     struct timeval select_timeout;
-    int tries=0;
+    int tries = 0;
+
 #ifdef USE_READPROGRESS
     int otries = 0;
-    time_t otime = time((time_t *)0);
+    time_t otime = time((time_t *) 0);
 #endif
 #if defined(UNIX) || defined(UCX)
     int nb;
 #endif /* UCX, BSN */
 
-#ifdef UNIX
+#if defined(UNIX) && !defined(__BEOS__)
     if (fildes == 0) {
 	/*
-	 *  0 can be a valid socket fd, but if it's a tty something must
-	 *  have gone wrong. - kw
+	 * 0 can be a valid socket fd, but if it's a tty something must have
+	 * gone wrong.  - kw
 	 */
 	if (isatty(fildes)) {
 	    CTRACE((tfp, "HTDoRead - refusing to read fd 0 which is a tty!\n"));
@@ -1950,7 +1978,6 @@ PUBLIC int HTDoRead ARGS3(
 #endif
 	return (HT_INTERRUPTED);
     }
-
 #if !defined(NO_IOCTL)
     ready = 0;
 #else
@@ -1958,8 +1985,8 @@ PUBLIC int HTDoRead ARGS3(
 #endif /* bypass for NO_IOCTL */
     while (!ready) {
 	/*
-	**  Protect against an infinite loop.
-	*/
+	 * Protect against an infinite loop.
+	 */
 	if (tries++ >= 180000) {
 	    HTAlert(gettext("Socket read failed for 180,000 tries."));
 #ifdef _WINDOWS
@@ -1969,10 +1996,9 @@ PUBLIC int HTDoRead ARGS3(
 #endif
 	    return HT_INTERRUPTED;
 	}
-
 #ifdef USE_READPROGRESS
 	if (tries - otries > 10) {
-	    time_t t = time((time_t *)0);
+	    time_t t = time((time_t *) 0);
 
 	    otries = tries;
 	    if (t - otime >= 5) {
@@ -1983,22 +2009,22 @@ PUBLIC int HTDoRead ARGS3(
 #endif
 
 	/*
-	**  If we suspend, then it is possible that select will be
-	**  interrupted.  Allow for this possibility. - JED
-	*/
+	 * If we suspend, then it is possible that select will be interrupted.
+	 * Allow for this possibility.  - JED
+	 */
 	do {
 	    select_timeout.tv_sec = 0;
 	    select_timeout.tv_usec = 100000;
 	    FD_ZERO(&readfds);
-	    FD_SET((unsigned)fildes, &readfds);
+	    FD_SET((unsigned) fildes, &readfds);
 #ifdef SOCKS
 	    if (socks_flag)
-		ret = Rselect((unsigned)fildes + 1,
-			      (void *)&readfds, NULL, NULL, &select_timeout);
+		ret = Rselect((unsigned) fildes + 1,
+			      &readfds, NULL, NULL, &select_timeout);
 	    else
 #endif /* SOCKS */
-		ret = select((unsigned)fildes + 1,
-			     (void *)&readfds, NULL, NULL, &select_timeout);
+		ret = select((unsigned) fildes + 1,
+			     &readfds, NULL, NULL, &select_timeout);
 	} while ((ret == -1) && (errno == EINTR));
 
 	if (ret < 0) {
@@ -2017,7 +2043,7 @@ PUBLIC int HTDoRead ARGS3(
 
 #if !defined(UCX) || !defined(VAXC)
 #ifdef UNIX
-    while ((nb = SOCKET_READ (fildes, buf, nbyte)) == -1) {
+    while ((nb = SOCKET_READ(fildes, buf, nbyte)) == -1) {
 	if (errno == EINTR)
 	    continue;
 #ifdef ERESTARTSYS
@@ -2028,23 +2054,23 @@ PUBLIC int HTDoRead ARGS3(
 	break;
     }
     return nb;
-#else  /* UNIX */
-    return SOCKET_READ (fildes, buf, nbyte);
+#else /* UNIX */
+    return SOCKET_READ(fildes, buf, nbyte);
 #endif /* !UNIX */
 
-#else  /* UCX && VAXC */
+#else /* UCX && VAXC */
     /*
-    **	VAXC and UCX problem only.
-    */
+     * VAXC and UCX problem only.
+     */
     errno = vaxc$errno = 0;
-    nb = SOCKET_READ (fildes, buf, nbyte);
+    nb = SOCKET_READ(fildes, buf, nbyte);
     CTRACE((tfp,
-	   "Read - nb,errno,vaxc$errno: %d %d %d\n", nb,errno,vaxc$errno));
+	    "Read - nb,errno,vaxc$errno: %d %d %d\n", nb, errno, vaxc$errno));
     if ((nb <= 0) && TRACE)
-	perror ("HTTCP.C:HTDoRead:read");	   /* RJF */
+	perror("HTTCP.C:HTDoRead:read");	/* RJF */
     /*
-    **	An errno value of EPIPE and nb < 0 indicates end-of-file on VAXC.
-    */
+     * An errno value of EPIPE and nb < 0 indicates end-of-file on VAXC.
+     */
     if ((nb <= 0) && (errno == EPIPE)) {
 	nb = 0;
 	set_errno(0);
@@ -2055,20 +2081,20 @@ PUBLIC int HTDoRead ARGS3(
 
 #ifdef SVR4_BSDSELECT
 /*
-**  This is a fix for the difference between BSD's select() and
-**  SVR4's select().  SVR4's select() can never return a value larger
-**  than the total number of file descriptors being checked.  So, if
-**  you select for read and write on one file descriptor, and both
-**  are true, SVR4 select() will only return 1.  BSD select in the
-**  same situation will return 2.
-**
-**	Additionally, BSD select() on timing out, will zero the masks,
-**	while SVR4 does not.  This is fixed here as well.
-**
-**	Set your tabstops to 4 characters to have this code nicely formatted.
-**
-**	Jerry Whelan, guru@bradley.edu, June 12th, 1993
-*/
+ *  This is a fix for the difference between BSD's select() and
+ *  SVR4's select().  SVR4's select() can never return a value larger
+ *  than the total number of file descriptors being checked.  So, if
+ *  you select for read and write on one file descriptor, and both
+ *  are true, SVR4 select() will only return 1.  BSD select in the
+ *  same situation will return 2.
+ *
+ *	Additionally, BSD select() on timing out, will zero the masks,
+ *	while SVR4 does not.  This is fixed here as well.
+ *
+ *	Set your tabstops to 4 characters to have this code nicely formatted.
+ *
+ *	Jerry Whelan, guru@bradley.edu, June 12th, 1993
+ */
 #ifdef select
 #undef select
 #endif /* select */
@@ -2083,47 +2109,45 @@ PUBLIC int HTDoRead ARGS3(
 #include <sys/time.h>
 #include <sys/select.h>
 
-PUBLIC int BSDselect ARGS5(
-	int,			nfds,
-	fd_set *,		readfds,
-	fd_set *,		writefds,
-	fd_set *,		exceptfds,
-	struct timeval *,	select_timeout)
+int BSDselect(int nfds,
+	      fd_set * readfds,
+	      fd_set * writefds,
+	      fd_set * exceptfds,
+	      struct timeval *select_timeout)
 {
-    int rval,
-    i;
+    int rval, i;
 
 #ifdef SOCKS
     if (socks_flag)
 	rval = Rselect(nfds, readfds, writefds, exceptfds, select_timeout);
     else
 #endif /* SOCKS */
-    rval = select(nfds, readfds, writefds, exceptfds, select_timeout);
+	rval = select(nfds, readfds, writefds, exceptfds, select_timeout);
 
     switch (rval) {
-	case -1:
-	    return(rval);
-
-	case 0:
-	    if (readfds != NULL)
-		FD_ZERO(readfds);
-	    if (writefds != NULL)
-		FD_ZERO(writefds);
-	    if (exceptfds != NULL)
-		FD_ZERO(exceptfds);
-	    return(rval);
-
-	default:
-	    for (i = 0, rval = 0; i < nfds; i++) {
-		if ((readfds != NULL) && FD_ISSET(i, readfds))
-		    rval++;
-		if ((writefds != NULL) && FD_ISSET(i, writefds))
-		    rval++;
-		if ((exceptfds != NULL) && FD_ISSET(i, exceptfds))
-		    rval++;
+    case -1:
+	return (rval);
+
+    case 0:
+	if (readfds != NULL)
+	    FD_ZERO(readfds);
+	if (writefds != NULL)
+	    FD_ZERO(writefds);
+	if (exceptfds != NULL)
+	    FD_ZERO(exceptfds);
+	return (rval);
+
+    default:
+	for (i = 0, rval = 0; i < nfds; i++) {
+	    if ((readfds != NULL) && FD_ISSET(i, readfds))
+		rval++;
+	    if ((writefds != NULL) && FD_ISSET(i, writefds))
+		rval++;
+	    if ((exceptfds != NULL) && FD_ISSET(i, exceptfds))
+		rval++;
 
-	    }
-	    return(rval);
+	}
+	return (rval);
     }
 /* Should never get here */
 }