snapshot of project "lynx", label v2-8-7dev_5b

4 files changed, 56 insertions, 18 deletions

diff --git a/WWW/Library/Implementation/HTTelnet.c b/WWW/Library/Implementation/HTTelnet.c
index c1ac3150..7765920e 100644
--- a/WWW/Library/Implementation/HTTelnet.c
+++ b/WWW/Library/Implementation/HTTelnet.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTelnet.c,v 1.37 2007/05/13 16:27:23 tom Exp $
+ * $LynxId: HTTelnet.c,v 1.38 2007/07/01 23:13:22 Daniel.Dickman Exp $
  *
  *		Telnet Access, Rlogin, etc			HTTelnet.c
  *		==========================
@@ -77,7 +77,7 @@ static int remote_session(char *acc_method, char *host)
      */
     /* prevent telnet://hostname;rm -rf *  URL's (VERY BAD)
      *  *cp=0;        // terminate at any ;,<,>,`,|,",' or space or return
-     * or tab to prevent security whole
+     * or tab to prevent security hole
      */
     for (cp = (strchr(host, '@') ? strchr(host, '@') : host); *cp != '\0';
 	 cp++) {
diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h
index 4d30538f..b6bc8280 100644
--- a/WWW/Library/Implementation/HTUtils.h
+++ b/WWW/Library/Implementation/HTUtils.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTUtils.h,v 1.76 2007/05/22 23:51:40 tom Exp $
+ * $LynxId: HTUtils.h,v 1.77 2007/07/01 15:30:33 tom Exp $
  *
  * Utility macros for the W3 code library
  * MACROS FOR GENERAL USE
@@ -59,12 +59,17 @@ char *alloca();
 /* Explicit system-configure */
 #ifdef VMS
 #define NO_SIZECHANGE
+
 #if defined(VAXC) && !defined(__DECC)
 #define NO_UNISTD_H		/* DEC C has unistd.h, but not VAX C */
 #endif
+
 #define NO_KEYPAD
 #define NO_UTMP
+
+#undef NO_FILIO_H
 #define NO_FILIO_H
+
 #define NOUSERS
 #define DISP_PARTIAL		/* experimental */
 #endif
diff --git a/WWW/Library/Implementation/www_tcp.h b/WWW/Library/Implementation/www_tcp.h
index 6189ab1e..4f5927e1 100644
--- a/WWW/Library/Implementation/www_tcp.h
+++ b/WWW/Library/Implementation/www_tcp.h
@@ -1,4 +1,6 @@
 /*                System dependencies in the W3 library
+ * $LynxId: www_tcp.h,v 1.35 2007/07/01 17:38:38 tom Exp $
+ *
                                    SYSTEM DEPENDENCIES
 
    System-system differences for TCP include files and macros.  This
@@ -297,12 +299,13 @@ VAX/VMS
 
   UCX                     DEC's "Ultrix connection" (default)
   CMU_TCP                 Available via FTP from sacusr.mp.usbr.gov
-  SOCKETSHR		  Eckhart Meyer's interface to NETLIB
+  SOCKETSHR               Eckhart Meyer's interface to NETLIB
   WIN_TCP                 From Wollongong, now GEC software.
   MULTINET                From SRI, became TGV, then Cisco.
   DECNET                  Cern's TCP socket emulation over DECnet
+  TCPIP_SERVICES          TCP/IP Services (newer than UCX)
 
-   The last three do not interfere with the
+   WIN_TCP, MULTINET and DECNET do not interfere with the
    unix i/o library, and so they need special calls to read, write and
    close sockets.  In these cases the socket number is a VMS channel
    number, so we make the @@@ HORRIBLE @@@ assumption that a channel
@@ -382,6 +385,18 @@ extern int socket_ioctl();
 #define IOCTL si_ioctl
 #endif /* SOCKETSHR_TCP */
 
+#ifdef TCPIP_SERVICES
+/*
+ * TCPIP Services has all of the entrypoints including ioctl().
+ */
+#undef NETWRITE
+#define NETWRITE(s,b,l) send((s),(char *)(b),(l))
+
+#define TYPE_FD_SET 1
+typedef int fd_set;
+
+#endif /* TCPIP_SERVICES */
+
 #include <string.h>
 
 #include <file.h>
@@ -514,6 +529,18 @@ struct timeval {
 #define TCP_INCLUDES_DONE
 #endif /* SOCKETSHR_TCP */
 
+#ifdef TCPIP_SERVICES
+#include <types.h>
+#include <errno.h>
+#include <time.h>
+#include <ioctl.h>
+#include <socket.h>
+#include <in.h>
+#include <inet.h>
+#include <netdb.h>
+#define TCP_INCLUDES_DONE
+#endif /* TCPIP_SERVICES */
+
 #ifdef WIN_TCP
 #include <types.h>
 #include <errno.h>
@@ -554,11 +581,8 @@ struct timeval {
 #endif /* !TCP_INCLUDES_DONE */
 
 /*
-
-   On VMS machines, the linker needs to be told to put global data sections into
- a data
-   segment using these storage classes. (MarkDonszelmann)
-
+ * On VMS machines, the linker needs to be told to put global data sections
+ * into a data segment using these storage classes.  (MarkDonszelmann)
  */
 #if defined(VAXC) && !defined(__DECC)
 #define GLOBALDEF globaldef
@@ -717,7 +741,7 @@ typedef unsigned short mode_t;
 #define DECL_SYS_ERRLIST 1
 #endif
 
-#if defined(VMS)
+#if defined(VMS) && !defined(TCPIP_SERVICES)
 #define socklen_t unsigned
 #else
 #define socklen_t int		/* used for default LY_SOCKLEN definition */
@@ -849,7 +873,10 @@ ROUGH ESTIMATE OF MAX PATH LENGTH
  */
 #ifdef SELECT
 #ifndef FD_SET
+#ifndef TYPE_FD_SET
+#define TYPE_FD_SET 1
 typedef unsigned int fd_set;
+#endif /* !TYPE_FD_SET */
 
 #define FD_SET(fd,pmask) (*(pmask)) |=  (1<<(fd))
 #define FD_CLR(fd,pmask) (*(pmask)) &= ~(1<<(fd))
diff --git a/WWW/Library/vms/libmake.com b/WWW/Library/vms/libmake.com
index 5ecfa177..014d510a 100644
--- a/WWW/Library/vms/libmake.com
+++ b/WWW/Library/vms/libmake.com
@@ -1,9 +1,12 @@
 $ v0 = 0
 $ v = f$verify(v0)
+$! $LynxId: libmake.com,v 1.12 2007/07/01 16:02:59 tom Exp $
 $!			LIBMAKE.COM
 $!
 $!   Command file to build the WWWLibrary on VMS systems.
 $!
+$!   01-Jul-2007	T.Dickey
+$!	add support for "TCPIP" (TCPIP Services)
 $!   23-Oct-2004	T.Dickey
 $!	cleanup, remove duplication, etc.
 $!   08-Oct-1997	F.Macrides		macrides@sci.wfeb.edu
@@ -63,19 +66,22 @@ $	write sys$output " [4] CMU_TCP"
 $	write sys$output " [5] SOCKETSHR_TCP"
 $	write sys$output " [6] TCPWARE"
 $ 	write sys$output " [7] DECNET"
-$ 	read sys$command/prompt="Agent [1,2,3,4,5,6,7] (RETURN = [1]) " agent
+$ 	write sys$output " [8] TCPIP"
+$ 	read sys$command/prompt="Agent [1,2,3,4,5,6,7,8] (RETURN = [1]) " agent
 $ ENDIF
 $ if agent .eq. 1 .or. agent .eqs. "" .or. p1 .eqs. "MULTINET" then -
     transport = "MULTINET"
-$ if agent .eq. 2 .or. p1 .eqs. "UCX" then transport = "UCX"
-$ if agent .eq. 3 .or. p1 .eqs. "WIN_TCP" then transport = "WIN_TCP"
-$ if agent .eq. 4 .or. p1 .eqs. "CMU_TCP" then transport = "CMU_TCP"
+$ if agent .eq. 2 .or. p1 .eqs. "UCX"           then transport = "UCX"
+$ if agent .eq. 3 .or. p1 .eqs. "WIN_TCP"       then transport = "WIN_TCP"
+$ if agent .eq. 4 .or. p1 .eqs. "CMU_TCP"       then transport = "CMU_TCP"
 $ if agent .eq. 5 .or. p1 .eqs. "SOCKETSHR_TCP" then transport = "SOCKETSHR_TCP"
-$ if agent .eq. 6 .or. p1 .eqs. "TCPWARE" then transport = "TCPWARE"
-$ if agent .eq. 7 .or. p1 .eqs. "DECNET" then transport = "DECNET"
+$ if agent .eq. 6 .or. p1 .eqs. "TCPWARE"       then transport = "TCPWARE"
+$ if agent .eq. 7 .or. p1 .eqs. "DECNET"        then transport = "DECNET"
+$ if agent .eq. 8 .or. p1 .eqs. "TCPIP"         then transport = "TCPIP"
 $!
 $ if transport .eqs. "SOCKETSHR_TCP" then extra_defs = extra_defs + ",_DECC_V4_SOURCE"
-$ if transport .eqs. "TCPWARE" then extra_defs = extra_defs + ",UCX"
+$ if transport .eqs. "TCPIP"         then extra_defs = extra_defs + ",_DECC_V4_SOURCE,TCPIP_SERVICES"
+$ if transport .eqs. "TCPWARE"       then extra_defs = extra_defs + ",UCX"
 $!
 $ if P2 .nes. ""
 $ then