diff options
| author | Thomas E. Dickey <dickey@invisible-island.net> | 2022-03-12 16:45:47 +0000 |
|---|---|---|
| committer | Thomas E. Dickey <dickey@invisible-island.net> | 2022-03-12 16:45:47 +0000 |
| commit | baa72f144c15896a40c794b967854f0508459a20 (patch) | |
| tree | 6ab4d8ff00ebf399e72f2dcbc3491c0538b5403a /WWW/Library/Implementation/HTTCP.c | |
| parent | d9c9f31fcbfa46070186e3f43a76fac3786fd824 (diff) | |
| download | lynx-snapshots-baa72f144c15896a40c794b967854f0508459a20.tar.gz | |
snapshot of project "lynx", label v2-9-0dev_10c
Diffstat (limited to 'WWW/Library/Implementation/HTTCP.c')
| -rw-r--r-- | WWW/Library/Implementation/HTTCP.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index c4d648ac..29529c7e 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTCP.c,v 1.160 2021/06/08 23:44:43 tom Exp $ + * $LynxId: HTTCP.c,v 1.162 2022/03/12 16:45:47 tom Exp $ * * Generic Communication Code HTTCP.c * ========================== @@ -1888,9 +1888,9 @@ int HTDoConnect(const char *url, HTSACat(&socks5_new_url, socks5_proxy); url = socks5_new_url; - socks5_protocol = HTSprintf0(NULL, - gettext("(for %s at %s) SOCKS5"), - protocol, socks5_host); + HTSprintf0(&socks5_protocol, + gettext("(for %s at %s) SOCKS5"), + protocol, socks5_host); protocol = socks5_protocol; } #ifndef INET6 @@ -2032,6 +2032,8 @@ int HTDoConnect(const char *url, * write service procedure. This will be * the normal case. */ + CTRACE((tfp, "connect(): status: %d, SOCK_ERRNO: %d\n", status, SOCKET_ERRNO)); + if ((status < 0) && (SOCKET_ERRNO == EINPROGRESS #ifdef EAGAIN @@ -2091,7 +2093,7 @@ int HTDoConnect(const char *url, * If we suspend, then it is possible that select will be * interrupted. Allow for this possibility. - JED */ - if ((ret == -1) && (errno == EINTR)) + if ((ret == -1) && (SOCKET_ERRNO == EINTR)) continue; #ifdef SOCKET_DEBUG_TRACE @@ -2273,7 +2275,7 @@ int HTDoConnect(const char *url, pbuf[0] = 0x05; /* VER: protocol version: X'05' */ pbuf[1] = 0x01; /* NMETHODS: 1 */ pbuf[2] = 0x00; /* METHOD: X'00' NO AUTHENTICATION REQUIRED */ - if (write(*s, pbuf, 3) != 3) { + if (NETWRITE(*s, (char *) pbuf, 3) != 3) { goto report_system_err; } else if (HTDoRead(*s, pbuf, 2) != 2) { goto report_system_err; @@ -2298,7 +2300,7 @@ int HTDoConnect(const char *url, memcpy(&pbuf[i], (unsigned char *) &x, sizeof x); i += (unsigned) sizeof(x); } - if ((size_t) write(*s, pbuf, i) != i) { + if ((size_t) NETWRITE(*s, (char *) pbuf, i) != i) { goto report_system_err; } else if ((unsigned) HTDoRead(*s, pbuf, 4) != 4) { goto report_system_err; @@ -2534,7 +2536,7 @@ int HTDoRead(int fildes, break; } #else /* UNIX */ - result = SOCKET_READ(fildes, buf, nbyte); + result = NETREAD(fildes, (char *) buf, nbyte); #endif /* !UNIX */ #endif /* UCX && VAXC */ } |