diff options
Diffstat (limited to 'WWW/Library/Implementation')
-rw-r--r-- | WWW/Library/Implementation/BSDI_Makefile | 405 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTUtils.h | 72 | ||||
-rw-r--r-- | WWW/Library/Implementation/SGML.h | 68 | ||||
-rw-r--r-- | WWW/Library/Implementation/tcp.h | 34 |
4 files changed, 40 insertions, 539 deletions
diff --git a/WWW/Library/Implementation/BSDI_Makefile b/WWW/Library/Implementation/BSDI_Makefile deleted file mode 100644 index 21ff1c02..00000000 --- a/WWW/Library/Implementation/BSDI_Makefile +++ /dev/null @@ -1,405 +0,0 @@ -# Make WWW under unix -# - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix - -# The ASIS repository's name for the machine we are on -ASIS_MACH = generic/unix - - -CFLAGS = -O -DDEBUG -DUSE_DIRENT -DSVR4 -DNO_FILIO_H -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -# Where is the W3 object library? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -# Common Makefile for W3 Library Code -# ----------------------------------- -# -# (c) CERN 1990, 1991 -- see Copyright.html for conditions -# -# This file should be invariant between systems. -# DEPENDENCIES NOT COMPLETE @@ -# -# make Compile and link the software (private version) -# make install Copy it into the system (implies make) -# make update Copy installed version into installed version -# make uninstall Unlink installed version from the system -# make clean Remove intermediate files -# make cleanall Remove intremediate files and products -# -# Macros required to be defined already for make: -# -# CC The C compiler -# CFLAGS Flags for $(CC) -- except the -I which are below -# LFLAGS Flags for ld -# LYFLAGS Flags for Lynx -# -# WWW The WWW source tree directory -# -# Macros needed for make install: -# -# LIBDIR Directory for installed library -#______________________________________________________________________ - -# If this env var is set to something else Some makes will use that instead -SHELL = /bin/sh - -# .h files are distributed but originally are made from the -# self-documenting hypertext files. - -.SUFFIXES: .h .html -.html.h: -# - chmod +w $*.h - www -w90 -na -to text/x-c $*.html > $*.h -# chmod -w $*.h - -# If this is actually run in a subdirectory, -# -# WWW = ../../.. -# WWW = ../.. For [cernlib] build in this directory - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ -VMS = $(CMN)vms -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include -# uncomment these and fill in WAISINC for adding direct wais access -# to Lynx. -#HTWAIS = $(LOB)/HTWAIS.o -#WAIS = YES -#WAISINC = -I../../../../freeWAIS-0.202/ir -#WAISCFLAGS = -DDIRECT_WAIS -# - -# This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation -# include $(CMN)Version.make -VC = 2.14 - -# XMOsAIC hack is only for server to cope with xmosaic kludge for mmedia -# -# add -DNEW_GATEWAY here for the new gateway config stuff -CFLAGS2 = $(CFLAGS) $(LYFLAGS) $(WAISCFLAGS) -I$(CMN) -DXMOSAIC_HACK -DACCESS_AUTH - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTFile.o $(LOB)/HTBTree.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \ - $(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \ - $(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o \ - $(LOB)/HTACL.o $(LOB)/HTAuth.o $(LOB)/HTAAProt.o \ - $(LOB)/HTAssoc.o $(LOB)/HTLex.o $(LOB)/HTUU.o - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ - $(CMN)HTBTree.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c \ - $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTFinger.c $(CMN)HTWAIS.c $(CMN)HTWSRC.c \ - $(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \ - $(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c \ - $(CMN)HTACL.c $(CMN)HTAuth.c $(CMN)HTAAProt.c \ - $(CMN)HTAssoc.c $(CMN)HTLex.c $(CMN)HTUU.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.h \ - $(CMN)HTBTree.h $(CMN)HTFTP.h $(CMN)HTTCP.h \ - $(CMN)SGML.h $(CMN)HTML.h $(CMN)HTMLDTD.h $(CMN)HTChunk.h \ - $(CMN)HTPlain.h $(CMN)HTWriter.h \ - $(CMN)HTFWriter.h $(CMN)HTMLGen.h \ - $(CMN)HTStream.h \ - $(CMN)HTAtom.h $(CMN)HTAnchor.h $(CMN)HTStyle.h \ - $(CMN)HTList.h \ - $(CMN)HTString.h $(CMN)HTAlert.h $(CMN)HTRules.h \ - $(CMN)HTFormat.h $(CMN)HTInit.h \ - $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ - $(CMN)HTGopher.h \ - $(CMN)HTUtils.h $(CMN)tcp.h $(CMN)HText.h \ - $(CMN)HTTelnet.h $(CMN)HTFinger.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAServ.h $(CMN)HTAABrow.h \ - $(CMN)HTAAFile.h $(CMN)HTPasswd.h $(CMN)HTGroup.h \ - $(CMN)HTACL.h $(CMN)HTAuth.h $(CMN)HTAAProt.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h $(CMN)HTUU.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make \ - $(CMN)CommonMakefile $(CMN)Makefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD $(WWW)/Makefile -SPECIFIC = $(WWW)/All/*/Makefile.include $(WWW)/All/Implementation/Makefile* \ - $(VMS)/descrip.mms $(VMS)/build_multinet.com \ - $(VMS)/COPYING.LIB $(VMS)/setup.com $(VMS)/multinet.opt \ - $(VMS)/patchlevel.h $(VMS)/ufc-crypt.h \ - $(VMS)/crypt.c $(VMS)/crypt_util.c \ - $(VMS)/getline.c $(VMS)/getpass.c \ - $(VMS)/HTVMSUtils.h $(VMS)/HTVMSUtils.c - - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean : - rm $(LOB)/*.o $(LOB)/.created - -rmdir $(LOB) - -# Clean up everything generatable including final products - -cleanall : clean - rm $(LOB)/libwww.a - -# Install W3 library into system space (not normally necessary) - -install : libwww.a - if [ ! -r $(LIBDIR) ] mkdir $(LIBDIR) - cp libwww.a $(LIBDIR)/libwww.a - -uninstall : - rm $(LIBDIR)/libwww.a - -# Distribution use only: -# ---------------------- - -# Needs www version 2.4 or later to do this -inc : $(HFILES) - echo Include files generated from hypertext. - -binary : /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a - echo FTP archive binary Libray $(VC) for $(WWW_MACH) up to date. - - -/pub/www/bin/$(WWW_MACH)/libwww_$(VC).a : libwww.a - -mkdir /pub/www/bin/$(WWW_MACH) - cp libwww.a /pub/www/bin/$(WWW_MACH)/libwww_$(VC).a - -# Source Distribution: - -distribute : /pub/www/README.txt /pub/www/Copyright.txt - (cd $(WWW)/..; WWW=WWW ABS=`pwd`/ make $(MFLAGS) \ - -f WWW/Library/Implementation/CommonMakefile \ - /pub/www/src/WWWLibrary_$(VC).tar.Z) - (cd ../Implementation; cvs tag \ - `sed -e 's/VC = /v/' Version.make | sed -e 's?\.?/?'` ) - echo Distribution of Library version $(VC) up to date. - -/pub/www/src/WWWLibrary_$(VC).tar.Z : $(SOURCES) - tar cf /pub/www/src/WWWLibrary_$(VC).tar \ - $(SOURCES) $(SPECIFIC) $(WC)/*/Makefile - compress /pub/www/src/WWWLibrary_$(VC).tar - - -# Hypertext supplied in text format -# --------------------------------- - -$(WWW)/README.txt : $(WWW)/../README.html - www -n -p66 http://www.w3.org/hypertext/README.html \ - > $(WWW)/README.txt -/pub/www/README.txt : $(WWW)/README.txt - cp $(WWW)/README.txt /pub/www/README.txt - -$(WWW)/Copyright.txt : $(WWW)/../Copyright.html - www -n -p66 http://www.w3.org/hypertext/Copyright.html \ - > $(WWW)/Copyright.txt -/pub/www/Copyright.txt : $(WWW)/Copyright.txt - cp $(WWW)/Copyright.txt /pub/www/Copyright.txt - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - if [ ! -r $(WTMP) ] ; then mkdir $(WTMP); else echo OK ; fi - if [ ! -r $(WTMP)/Library ] ; then mkdir $(WTMP)/Library; else echo OK ; fi - if [ ! -r $(WTMP)/Library/$(WWW_MACH) ] ; \ - then mkdir $(WTMP)/Library/$(WWW_MACH); else echo OK ; fi - touch $@ - -$(LOB)/HTList.o : $(OE) $(CMN)HTList.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTList.c - -$(LOB)/HTAnchor.o : $(OE) $(CMN)HTAnchor.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAnchor.c - -$(LOB)/HTFormat.o : $(OE) $(CMN)HTFormat.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFormat.c - -$(LOB)/HTMIME.o : $(OE) $(CMN)HTMIME.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMIME.c - -$(LOB)/HTHistory.o : $(OE) $(CMN)HTHistory.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTHistory.c - -$(LOB)/HTNews.o : $(OE) $(CMN)HTNews.c $(CMN)HTUtils.h $(CMN)HTList.h\ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h \ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h $(CMN)../../../userdefs.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.c - -$(LOB)/HTFinger.o : $(OE) $(CMN)HTFinger.c $(CMN)HTUtils.h $(CMN)HTList.h \ - $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFinger.c - -$(LOB)/HTStyle.o : $(OE) $(CMN)HTStyle.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTStyle.c - -$(LOB)/HTAtom.o : $(OE) $(CMN)HTAtom.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAtom.c - -$(LOB)/HTChunk.o : $(OE) $(CMN)HTChunk.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTChunk.c - -$(LOB)/HTString.o : $(OE) $(CMN)HTString.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTString.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make \ - $(CMN)HTAAServ.h $(CMN)HTAAProt.h - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.h $(CMN)UCAux.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)SGML.c - -$(LOB)/HTMLGen.o : $(OE) $(CMN)HTMLGen.c $(CMN)HTUtils.h $(CMN)HTMLDTD.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLGen.c - -$(LOB)/HTMLDTD.o : $(OE) $(CMN)HTMLDTD.c $(CMN)SGML.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTMLDTD.c - -$(LOB)/HTPlain.o : $(OE) $(CMN)HTPlain.c $(CMN)HTPlain.h $(CMN)HTStream.h \ - $(CMN)UCAux.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPlain.c - -$(LOB)/HTWAIS.o : $(OE) $(CMN)HTWAIS.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(WAISINC) $(CMN)HTWAIS.c - -$(LOB)/HTWSRC.o : $(OE) $(CMN)HTWSRC.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWSRC.c - -$(LOB)/HTWriter.o : $(OE) $(CMN)HTWriter.c $(CMN)HTWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTWriter.c - - -# Access Authorization - -$(LOB)/HTAAUtil.o : $(OE) $(CMN)HTAAUtil.c $(CMN)HTAAUtil.h \ - $(CMN)HTUtils.h $(CMN)HTString.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAUtil.c - -$(LOB)/HTAAFile.o : $(OE) $(CMN)HTAAFile.c $(CMN)HTAAFile.h \ - $(CMN)HTAAUtil.h $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAFile.c - -$(LOB)/HTPasswd.o : $(OE) $(CMN)HTPasswd.c $(CMN)HTPasswd.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTPasswd.c - -$(LOB)/HTGroup.o : $(OE) $(CMN)HTGroup.c $(CMN)HTGroup.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGroup.c - -$(LOB)/HTACL.o : $(OE) $(CMN)HTACL.c $(CMN)HTACL.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTGroup.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTACL.c - -$(LOB)/HTAuth.o : $(OE) $(CMN)HTAuth.c $(CMN)HTAuth.h \ - $(CMN)HTAAUtil.h $(CMN)HTPasswd.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAuth.c - -$(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \ - $(CMN)HTAAUtil.h $(CMN)HTAAFile.h $(CMN)HTPasswd.h \ - $(CMN)HTGroup.h $(CMN)HTACL.h $(CMN)HTAuth.h \ - $(CMN)HTUU.h $(CMN)HTParse.h $(CMN)HTList.h \ - $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTRules.h \ - $(CMN)HTAAProt.h $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAServ.c - -$(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \ - $(CMN)HTAAUtil.h $(CMN)HTUU.h \ - $(CMN)HTUtils.h $(CMN)HTString.h \ - $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \ - $(CMN)HTAssoc.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c - -$(LOB)/HTAAProt.o : $(OE) $(CMN)HTAAProt.c $(CMN)HTAAProt.h \ - $(CMN)HTUtils.h $(CMN)HTAAUtil.h $(CMN)HTAAFile.h \ - $(CMN)HTAssoc.h $(CMN)HTLex.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAAProt.c - -$(LOB)/HTAssoc.o : $(OE) $(CMN)HTAssoc.c $(CMN)HTAssoc.h \ - $(CMN)HTUtils.h $(CMN)HTString.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAssoc.c - -$(LOB)/HTLex.o : $(OE) $(CMN)HTLex.c $(CMN)HTLex.h $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTLex.c - -$(LOB)/HTUU.o : $(OE) $(CMN)HTUU.c $(CMN)HTUU.h $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTUU.c - - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.h $(CMN)HTAABrow.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTP.c - -$(LOB)/HTTCP.o : $(OE) $(CMN)HTTCP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTCP.c - -$(LOB)/HTFile.o : $(OE) $(CMN)HTFile.c $(CMN)HTUtils.h \ - $(CMN)HTMLDTD.h $(CMN)HTAAServ.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.c - -$(LOB)/HTBTree.o : $(OE) $(CMN)HTBTree.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTBTree.c - -$(LOB)/HTFTP.o : $(OE) $(CMN)HTFTP.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFTP.c - -$(LOB)/HTAccess.o : $(OE) $(CMN)HTAccess.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAccess.c - -$(LOB)/HTParse.o : $(OE) $(CMN)HTParse.c $(CMN)HTUtils.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTParse.c - diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 21128bb9..9e7ea323 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -31,78 +31,6 @@ /* FIXME: these will be removed after completing auto-configure script */ -#ifdef _IBMR2 -#define USE_DIRENT /* sys V style directory open */ -#endif /* _IBMR2 */ - -#ifdef _SYSV3 -#include <fcntl.h> -#define USE_DIRENT /* sys V style directory open */ -#endif /* _SYSV3 */ - -/* Solaris. */ -#if defined(sun) && defined(__svr4__) && !defined(USE_DIRENT) -#define USE_DIRENT /* sys V style directory open */ -#endif /* sun && __svr4__ && !USE_DIRENT */ - -#ifdef __alpha -#define USE_DIRENT -#endif /* __alpha */ - -#ifndef USE_DIRENT -#ifdef SVR4 -#define USE_DIRENT -#endif /* SVR4 */ -#endif /* !USE_DIRENT */ - -#ifndef SOLARIS2 -#include <string.h> /* For bzero etc */ -#endif /* !SOLARIS2 */ - -#ifdef SCO -#define sco -#endif /* SCO */ -#ifdef sco -#include <sys/fcntl.h> -#define USE_DIRENT -#endif /* sco */ - -/* -Intergraph CLIX - */ -#ifdef CLIX -#include <sys/fcntl.h> -#define USE_DIRENT -#endif /* CLIX */ - -#ifdef ISC -#ifndef NO_UNISTD_H -#include <sys/unistd.h> -#endif /* !NO_UNISTD_H */ -#else -#if !defined(NO_UNISTD_H) && !defined(VMS) -#include <unistd.h> -#endif /* !NO_UNISTD_H && !VMS */ -#endif /* ISC */ - -#if defined(SVR4) || defined(UNIXWARE) -#include <sys/fcntl.h> -#ifndef NO_FILIO_H /* BSD Interactive doesn't have filio.h. */ -#include <sys/filio.h> -#endif /* !NO_FILIO_H */ -#endif /* SVR4 || UNIXWARE */ - -/* -SOLARIS 2 - */ -#ifdef SOLARIS2 -#include <sys/filio.h> -#endif /* SOLARIS2 */ - -#ifndef NO_FILIO_H -#define NO_FILIO_H /* prevent conflict between autoconf & BSDI make */ -#endif - /* Accommodate pre-autoconf Makefile */ #ifndef NO_CBREAK diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h index 09ff6fe9..b30a8230 100644 --- a/WWW/Library/Implementation/SGML.h +++ b/WWW/Library/Implementation/SGML.h @@ -8,10 +8,10 @@ to functions which are called to implement the actual effect of the text read. When these functions are called, the attribute structures pointed to by the - DTD are valid, and the function is passed a pointer to the curent tag structure, and an + DTD are valid, and the function is passed a pointer to the current tag structure, and an "element stack" which represents the state of nesting within SGML elements. - The following aspects are from Dan Connolly's suggestions: Binary search, Strcutured + The following aspects are from Dan Connolly's suggestions: Binary search, Structured object scheme basically, SGML content enum type. (c) Copyright CERN 1991 - See Copyright.html @@ -49,52 +49,50 @@ typedef struct { /* Could put type info in here */ } attr; -typedef enum _TagClass { +typedef int TagClass; /* textflow */ - Tgc_FONTlike = 0x00001,/* S,STRIKE,I,B,TT,U,BIG,SMALL,STYLE,BLINK;BR,TAB */ - Tgc_EMlike = 0x00002, /* EM,STRONG,DFN,CODE,SAMP,KBD,VAR,CITE,Q,INS,DEL,SPAN,.. */ - Tgc_MATHlike = 0x00004, /* SUB,SUP,MATH,COMMENT */ - Tgc_Alike = 0x00008, /* A */ - Tgc_formula = 0x00010, /* not used until math is supported better... */ +#define Tgc_FONTlike 0x00001 /* S,STRIKE,I,B,TT,U,BIG,SMALL,STYLE,BLINK;BR,TAB */ +#define Tgc_EMlike 0x00002 /* EM,STRONG,DFN,CODE,SAMP,KBD,VAR,CITE,Q,INS,DEL,SPAN,.. */ +#define Tgc_MATHlike 0x00004 /* SUB,SUP,MATH,COMMENT */ +#define Tgc_Alike 0x00008 /* A */ +#define Tgc_formula 0x00010 /* not used until math is supported better... */ /* used for special structures: forms, tables,... */ - Tgc_TRlike = 0x00020,/* TR and similar */ - Tgc_SELECTlike = 0x00040,/* SELECT,INPUT,TEXTAREA(,...) */ +#define Tgc_TRlike 0x00020 /* TR and similar */ +#define Tgc_SELECTlike 0x00040 /* SELECT,INPUT,TEXTAREA(,...) */ /* structure */ - Tgc_FORMlike = 0x00080,/* FORM itself */ - Tgc_Plike = 0x00100, /* P,H1..H6,... structures containing text or +#define Tgc_FORMlike 0x00080 /* FORM itself */ +#define Tgc_Plike 0x00100 /* P,H1..H6,... structures containing text or insertion but not other structures */ - Tgc_DIVlike = 0x00200, /* ADDRESS,FIG,BDO,NOTE,FN,DIV,CENTER;FIG +#define Tgc_DIVlike 0x00200 /* ADDRESS,FIG,BDO,NOTE,FN,DIV,CENTER;FIG structures which can contain other structures */ - Tgc_LIlike = 0x00400, /* LH,LI,DT,DD;TH,TD structure-like, only valid +#define Tgc_LIlike 0x00400 /* LH,LI,DT,DD;TH,TD structure-like, only valid within certain other structures */ - Tgc_ULlike = 0x00800, /* UL,OL,DL,DIR,MENU;TABLE;XMP,LISTING +#define Tgc_ULlike 0x00800 /* UL,OL,DL,DIR,MENU;TABLE;XMP,LISTING special in some way, cannot contain (parsed) text directly */ /* insertions */ - Tgc_BRlike = 0x01000,/* BR,IMG,TAB allowed in any text */ - Tgc_APPLETlike = 0x02000, /* APPLET,OBJECT,EMBED,SCRIPT */ - Tgc_HRlike = 0x04000, /* HR,MARQUEE can contain all kinds of things +#define Tgc_BRlike 0x01000 /* BR,IMG,TAB allowed in any text */ +#define Tgc_APPLETlike 0x02000 /* APPLET,OBJECT,EMBED,SCRIPT */ +#define Tgc_HRlike 0x04000 /* HR,MARQUEE can contain all kinds of things and/or are not allowed (?) in running text */ - Tgc_MAPlike = 0x08000, /* MAP,AREA some specials that never contain +#define Tgc_MAPlike 0x08000 /* MAP,AREA some specials that never contain (directly or indirectly) other things than special insertions */ - Tgc_outer = 0x10000, /* HTML,FRAMESET,FRAME,PLAINTEXT; */ - Tgc_BODYlike = 0x20000, /* BODY,BODYTEXT,NOFRAMES,TEXTFLOW; */ - Tgc_HEADstuff = 0x40000, /* HEAD,BASE,STYLE,TITLE; */ +#define Tgc_outer 0x10000 /* HTML,FRAMESET,FRAME,PLAINTEXT; */ +#define Tgc_BODYlike 0x20000 /* BODY,BODYTEXT,NOFRAMES,TEXTFLOW; */ +#define Tgc_HEADstuff 0x40000 /* HEAD,BASE,STYLE,TITLE; */ /* special relations */ - Tgc_same = 0x80000 -} TagClass; +#define Tgc_same 0x80000 /* Some more properties of tags (or rather, elements) and rules how to deal with them. - kw */ -typedef enum _TagFlags { - Tgf_endO = 0x00001, /* end tag can be Omitted */ - Tgf_startO = 0x00002, /* start tag can be Omitted */ - Tgf_mafse = 0x00004, /* Make Attribute-Free Start-tag End instead +typedef int TagFlags; +#define Tgf_endO 0x00001 /* end tag can be Omitted */ +#define Tgf_startO 0x00002 /* start tag can be Omitted */ +#define Tgf_mafse 0x00004 /* Make Attribute-Free Start-tag End instead (if found invalid) */ - Tgf_strict = 0x00008 /* Ignore contained invalid elements, +#define Tgf_strict 0x00008 /* Ignore contained invalid elements, don't pass them on */ -} TagFlags; /* A tag structure describes an SGML element. ** ----------------------------------------- @@ -105,7 +103,7 @@ typedef enum _TagFlags { ** attributes points to a zero-terminated array ** of attribute names. ** -** litteral determines how the SGML engine parses the charaters +** litteral determines how the SGML engine parses the characters ** within the element. If set, tag openers are ignored ** except for that which opens a matching closing tag. ** @@ -166,11 +164,11 @@ typedef struct _HTSGMLContext *HTSGMLContext; /* Hidden */ Structured Object definition A structured object is something which can reasonably be represented - in SGML. I'll rephrase that. A structured object is am ordered + in SGML. I'll rephrase that. A structured object is an ordered tree-structured arrangement of data which is representable as text. - The SGML parer outputs to a Structured object. A Structured object + The SGML parser outputs to a Structured object. A Structured object can output its contents to another Structured Object. It's a kind of - typed stream. The architecure is largely Dan Conolly's. Elements and + typed stream. The architecture is largely Dan Conolly's. Elements and entities are passed to the sob by number, implying a knowledge of the DTD. Knowledge of the SGML syntax is not here, though. @@ -227,7 +225,7 @@ typedef struct _HTStructuredClass{ /* Equivalents to the following functions possibly could be generalised - into additional HTStructuredClass members. FOr now they don't do + into additional HTStructuredClass members. For now they don't do anything target-specific. - kw */ extern BOOLEAN LYCheckForCSI PARAMS((HTParentAnchor *anchor, char **url)); diff --git a/WWW/Library/Implementation/tcp.h b/WWW/Library/Implementation/tcp.h index 7dde5f34..7bfdb39b 100644 --- a/WWW/Library/Implementation/tcp.h +++ b/WWW/Library/Implementation/tcp.h @@ -75,7 +75,6 @@ typedef struct sockaddr_in SockA; /* See netinet/in.h */ #else # define D_NAMLEN(dirent) (dirent)->d_namlen # define STRUCT_DIRENT struct direct -# define direct dirent /* FIXME */ # if HAVE_SYS_NDIR_H # include <sys/ndir.h> # endif @@ -485,9 +484,6 @@ struct timeval { #define NETCLOSE close_s #endif -/* -SCO ODT unix version - */ #if HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ @@ -511,7 +507,6 @@ Regular BSD unix versions */ #ifndef INCLUDES_DONE #include <sys/types.h> -/* #include <streams/streams.h> not ultrix */ #if HAVE_STRING_H #include <string.h> #endif /* HAVE_STRING_H */ @@ -527,16 +522,20 @@ Regular BSD unix versions #include <sys/stat.h> #include <sys/param.h> #include <sys/file.h> /* For open() etc */ + #if defined(NeXT) || defined(sony_news) #ifndef mode_t typedef unsigned short mode_t; #endif /* !mode_t */ + #ifndef pid_t typedef int pid_t; #endif /* !pid_t */ + #ifndef S_ISREG #define S_ISREG(m) (((m) & 0170000) == 0100000) #endif /* S_ISREG */ + #ifndef WEXITSTATUS #ifdef sony_news #define WEXITSTATUS(s) WIFEXITED(s) @@ -544,6 +543,7 @@ typedef int pid_t; #define WEXITSTATUS(s) (((s).w_status >> 8) & 0377) #endif /* sony_news */ #endif /* !WEXITSTATUS */ + #ifndef WTERMSIG #ifdef sony_news #define WTERMSIG(s) (s).w_termsig @@ -551,7 +551,9 @@ typedef int pid_t; #define WTERMSIG(s) (((s).w_status >> 8) & 0177) #endif /* sony_news */ #endif /* !WTERMSIG */ + #endif /* NeXT || sony_news */ + #define INCLUDES_DONE #endif /* Normal includes */ @@ -593,28 +595,6 @@ typedef int pid_t; #else -/* FIXME: remove after completing configure-script */ -#ifdef unix /* if this is to compile on a UNIX machine */ -#define HAVE_READDIR 1 /* if directory reading functions are available */ -#ifdef USE_DIRENT /* sys v version */ -#include <dirent.h> -#define direct dirent -#else -#include <sys/dir.h> -#endif /* USE_DIRENT */ -#if defined(sun) && defined(__svr4__) -#include <sys/fcntl.h> -#include <limits.h> -#else -#if defined(__hpux) || defined(LINUX) || defined (__FreeBSD__) -#include <limits.h> -#endif /* __hpux || LINUX || __FreeBSD__ */ -#endif /* sun && __svr4__ */ -#if !defined(MAXINT) && defined(INT_MAX) -#define MAXINT INT_MAX -#endif /* !MAXINT && INT_MAX */ -#endif /* unix */ - #ifndef VM #ifndef VMS #ifndef THINK_C |