diff options
Diffstat (limited to 'WWW/Library')
-rw-r--r-- | WWW/Library/Implementation/HTAccess.c | 11 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTAnchor.c | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTAnchor.h | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTChunk.h | 5 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTMIME.c | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTML.h | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTMLDTD.c | 4 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTMLGen.c | 2 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTPlain.c | 14 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTUtils.h | 1 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTWAIS.c | 4 | ||||
-rw-r--r-- | WWW/Library/Implementation/Makefile | 489 | ||||
-rw-r--r-- | WWW/Library/Implementation/SGML.c | 37 | ||||
-rw-r--r-- | WWW/Library/Implementation/SGML.h | 4 | ||||
-rw-r--r-- | WWW/Library/unix/Makefile | 30 | ||||
-rw-r--r-- | WWW/Library/vms/libmake.com | 16 |
16 files changed, 17 insertions, 608 deletions
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index ba73c3fe..c2e75d41 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -843,17 +843,22 @@ PRIVATE BOOL HTLoadDocument ARGS4( reloading = TRUE; #endif ForcingNoCache = YES; - if (TRACE) + if (TRACE) { fprintf(stderr, "HTAccess: Auto-reloading document.\n"); + } } } /* ** Get the document from the net. If we are auto-reloading, - ** the previous rendition will be freed in conjunction with - ** loading of the new rendition. - FM + ** the mutable anchor elements from the previous rendition + ** should be freed in conjunction with loading of the new + ** rendition. - FM */ LYforce_no_cache = NO; /* reset after each time through */ + if (ForcingNoCache) { + FREE(anchor->title); + } status = HTLoad(address_to_load, anchor, format_out, sink); if (TRACE) { fprintf(stderr, "HTAccess: status=%d\n", status); diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c index 20f7cfe1..b15d5e6b 100644 --- a/WWW/Library/Implementation/HTAnchor.c +++ b/WWW/Library/Implementation/HTAnchor.c @@ -696,9 +696,7 @@ PUBLIC BOOL HTAnchor_delete ARGS1( */ FREE(me->address); -#ifdef EXP_CHARTRANS FREE (me->UCStages); -#endif ImageMapList_free(me->imaps); diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h index b86c372c..4b751d03 100644 --- a/WWW/Library/Implementation/HTAnchor.h +++ b/WWW/Library/Implementation/HTAnchor.h @@ -16,9 +16,7 @@ #include "HTList.h" #include "HTAtom.h" -#ifdef EXP_CHARTRANS #include "UCDefs.h" -#endif #ifdef SHORT_NAMES #define HTAnchor_findChild HTAnFiCh diff --git a/WWW/Library/Implementation/HTChunk.h b/WWW/Library/Implementation/HTChunk.h index a5e89b31..37ef890c 100644 --- a/WWW/Library/Implementation/HTChunk.h +++ b/WWW/Library/Implementation/HTChunk.h @@ -7,9 +7,7 @@ automatically reallocating them as necessary. */ -#ifdef EXP_CHARTRANS #include "UCMap.h" -#endif typedef struct { int size; /* In bytes */ @@ -126,11 +124,8 @@ extern void HTChunkPutc PARAMS((HTChunk * ch, char c)); extern void HTChunkPutb PARAMS((HTChunk * ch, CONST char *b, int l)); -#ifdef EXP_CHARTRANS extern void HTChunkPutUtf8Char PARAMS((HTChunk * ch, UCode_t code)); -#endif /* EXP_CHARTRANS */ - /* Append a string to a chunk diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c index 6c9a83ab..e060d372 100644 --- a/WWW/Library/Implementation/HTMIME.c +++ b/WWW/Library/Implementation/HTMIME.c @@ -2199,12 +2199,10 @@ PUBLIC HTStream* HTMIMEConvert ARGS3( me->encoding = 0; /* Not set yet */ me->compression_encoding = NULL; /* Not set yet */ me->net_ascii = NO; /* Local character set */ -#ifdef EXP_CHARTRANS HTAnchor_setUCInfoStage(me->anchor, current_char_set, UCT_STAGE_STRUCTURED, UCT_SETBY_DEFAULT); HTAnchor_setUCInfoStage(me->anchor, current_char_set, UCT_STAGE_HTEXT, UCT_SETBY_DEFAULT); -#endif /* EXP_CHARTRANS */ return me; } diff --git a/WWW/Library/Implementation/HTML.h b/WWW/Library/Implementation/HTML.h index 42bf4638..bca7c41b 100644 --- a/WWW/Library/Implementation/HTML.h +++ b/WWW/Library/Implementation/HTML.h @@ -7,10 +7,8 @@ #ifndef HTML_H #define HTML_H -#ifdef EXP_CHARTRANS #include "UCDefs.h" #include "UCAux.h" -#endif #ifndef HTUTILS_H #include "HTUtils.h" diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c index e2ac932d..c8356523 100644 --- a/WWW/Library/Implementation/HTMLDTD.c +++ b/WWW/Library/Implementation/HTMLDTD.c @@ -131,7 +131,6 @@ static CONST char* entities[] = { #define HTML_ENTITIES 112 -#ifdef EXP_CHARTRANS /* Extra Entity Names ** ------------------ ** @@ -443,7 +442,6 @@ static CONST UC_entity_info extra_entities[] = { {"zwj", 8205}, /* zero width joiner */ {"zwnj", 8204}, /* zero width non-joiner */ }; -#endif /* EXP_CHARTRANS */ /* Attribute Lists ** --------------- @@ -1892,10 +1890,8 @@ PUBLIC CONST SGML_dtd HTML_dtd = { HTML_ELEMENTS, entities, sizeof(entities)/sizeof(char*), -#ifdef EXP_CHARTRANS extra_entities, sizeof(extra_entities)/sizeof(UC_entity_info), -#endif }; /* This function fills the "tags" part of the HTML_dtd structure with diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c index 7190d947..375b619c 100644 --- a/WWW/Library/Implementation/HTMLGen.c +++ b/WWW/Library/Implementation/HTMLGen.c @@ -377,11 +377,9 @@ PRIVATE int HTMLGen_put_entity ARGS2( HTMLGen_put_character(me, '&'); if (entity_number < nent) HTMLGen_put_string(me, HTML_dtd.entity_names[entity_number]); -#ifdef EXP_CHARTRANS else HTMLGen_put_string(me, HTML_dtd.extra_entity_info[entity_number-nent].name); -#endif HTMLGen_put_character(me, ';'); return HT_OK; } diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c index 49d8c651..78f027ea 100644 --- a/WWW/Library/Implementation/HTPlain.c +++ b/WWW/Library/Implementation/HTPlain.c @@ -18,11 +18,9 @@ #include "HTStyle.h" #include "HTMLDTD.h" #include "HTCJK.h" -#ifdef EXP_CHARTRANS #include "UCMap.h" #include "UCDefs.h" #include "UCAux.h" -#endif /* EXP_CHARTRANS */ #include "LYCharSets.h" #include "LYLeaks.h" @@ -88,7 +86,6 @@ PRIVATE void HTPlain_getChartransInfo ARGS2( ** A C T I O N R O U T I N E S */ -#ifdef EXP_CHARTRANS /* for forward reference to HTPlain_write - kw */ #ifdef _WINDOWS PRIVATE void HTPlain_write (HTStream * me, CONST char* s, int l); @@ -98,7 +95,6 @@ PRIVATE void HTPlain_write PARAMS(( CONST char * s, int l)); #endif /* _WINDOWS */ -#endif /* EXP_CHARTRANS */ /* Character handling ** ------------------ @@ -329,17 +325,11 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l) if (HTCJK != NOCJK) { HText_appendCharacter(me->text, c_p); -#ifndef EXP_CHARTRANS -#define PASSHICTRL HTPassHighCtrlRaw -#define PASS8859SPECL HTPassHighCtrlRaw -#define PASSHI8BIT HTPassEightBitRaw -#else #define PASSHICTRL (me->T.transp || \ code >= LYlowest_eightbit[me->in_char_set]) #define PASS8859SPECL me->T.pass_160_173_raw #define PASSHI8BIT (HTPassEightBitRaw || \ (me->T.do_8bitraw && !me->T.trans_from_uni)) -#endif /* EXP_CHARTRANS */ /* ** If HTPassHighCtrlRaw is set (e.g., for KOI8-R) assume the @@ -529,7 +519,6 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l) ** either output as UTF8 or a hex representation or ** pass the raw character and hope it's OK. */ -#ifdef EXP_CHARTRANS if (!PASSHI8BIT) c_p = FROMASCII((char)code); if (me->T.output_utf8 && @@ -542,7 +531,6 @@ PRIVATE void HTPlain_write ARGS3(HTStream *, me, CONST char*, s, int, l) sprintf(replace_buf, "U%.2lX", code); HText_appendText(me->text, replace_buf); } else -#endif /* EXP_CHARTRANS */ HText_appendCharacter(me->text, c_p); } } else { @@ -624,7 +612,6 @@ PUBLIC HTStream* HTPlainPresent ARGS3( HTPlain_lastraw = -1; -#ifdef EXP_CHARTRANS me->utf_count = 0; me->utf_char = 0; me->utf_buf[0] = me->utf_buf[6] =me->utf_buf[7] = '\0'; @@ -637,7 +624,6 @@ PUBLIC HTStream* HTPlainPresent ARGS3( me->in_char_set, me->UCI, me->htext_char_set, HTAnchor_getUCInfoStage(anchor,UCT_STAGE_HTEXT)); -#endif /* EXP_CHARTRANS */ me->text = HText_new(anchor); HText_setStyle(me->text, HTStyleNamed(styleSheet, "Example")); HText_beginAppend(me->text); diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 458b8171..0eb9bfba 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -23,7 +23,6 @@ #ifdef VMS #define NO_SIZECHANGE #define NO_UNISTD_H -#define EXP_CHARTRANS #define NO_KEYPAD #define NO_UTMP #endif diff --git a/WWW/Library/Implementation/HTWAIS.c b/WWW/Library/Implementation/HTWAIS.c index ed28162f..0aab515c 100644 --- a/WWW/Library/Implementation/HTWAIS.c +++ b/WWW/Library/Implementation/HTWAIS.c @@ -53,12 +53,10 @@ #include "HTParse.h" #include "HTAccess.h" /* We implement a protocol */ #include "HTML.h" /* The object we will generate */ -#include "HTFormat.h" +#include "HTWSRC.h" #include "HTTCP.h" #include "HTCJK.h" #include "HTAlert.h" -/* #include "HTWSRC.h" */ /* Need some bits from here */ -/* #include "ParseWSRC.h" */ /* From WAIS ** --------- diff --git a/WWW/Library/Implementation/Makefile b/WWW/Library/Implementation/Makefile deleted file mode 100644 index 7f028976..00000000 --- a/WWW/Library/Implementation/Makefile +++ /dev/null @@ -1,489 +0,0 @@ -# Makefile generated by imake - do not edit! -# $XConsortium: imake.c,v 1.51 89/12/12 12:37:30 jim Exp $ -# -# The cpp used on this machine replaces all newlines and multiple tabs and -# spaces in a macro expansion with a single space. Imake tries to compensate -# for this, but is not always successful. -# - -########################################################################### -# Makefile generated from "Imake.tmpl" and </tmp/IIf.a00214> -# $XConsortium: Imake.tmpl,v 1.77 89/12/18 17:01:37 jim Exp $ -# -# Platform-specific parameters may be set in the appropriate .cf -# configuration files. Site-wide parameters may be set in the file -# site.def. Full rebuilds are recommended if any parameters are changed. -# -# If your C preprocessor doesn't define any unique symbols, you'll need -# to set BOOTSTRAPCFLAGS when rebuilding imake (usually when doing -# "make Makefile", "make Makefiles", or "make World"). -# -# If you absolutely can't get imake to work, you'll need to set the -# variables at the top of each Makefile as well as the dependencies at the -# bottom (makedepend will do this automatically). -# - -########################################################################### -# platform-specific configuration parameters - edit sun.cf to change - -# platform: $XConsortium: sun.cf,v 1.38 89/12/23 16:10:10 jim Exp $ -# operating system: SunOS 4.0.3 - -########################################################################### -# site-specific configuration parameters - edit site.def to change - - SHELL = /bin/sh - - TOP = . - CURRENT_DIR = . - - AR = ar clq - BOOTSTRAPCFLAGS = - CC = cc - - COMPRESS = compress - CPP = /lib/cpp $(STD_CPP_DEFINES) - PREPROCESSCMD = cc -E $(STD_CPP_DEFINES) - INSTALL = install - LD = ld - LINT = lint - LINTLIBFLAG = -C - LINTOPTS = -axz - LN = ln -s - MAKE = make - MV = mv - CP = cp - RANLIB = ranlib - RANLIBINSTFLAGS = - RM = rm -f - STD_INCLUDES = - STD_CPP_DEFINES = - STD_DEFINES = - EXTRA_LOAD_FLAGS = - EXTRA_LIBRARIES = - TAGS = ctags - - SHAREDCODEDEF = -DSHAREDCODE - SHLIBDEF = -DSUNSHLIB - - PROTO_DEFINES = - - INSTPGMFLAGS = - - INSTBINFLAGS = -m 0755 - INSTUIDFLAGS = -m 4755 - INSTLIBFLAGS = -m 0664 - INSTINCFLAGS = -m 0444 - INSTMANFLAGS = -m 0444 - INSTDATFLAGS = -m 0444 - INSTKMEMFLAGS = -m 4755 - - DESTDIR = - - TOP_INCLUDES = -I$(INCROOT) - - CDEBUGFLAGS = -O - CCOPTIONS = - COMPATFLAGS = - - ALLINCLUDES = $(STD_INCLUDES) $(TOP_INCLUDES) $(INCLUDES) $(EXTRA_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(DEFINES) $(COMPATFLAGS) - CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) - LDLIBS = $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) - LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) - LDCOMBINEFLAGS = -X -r - - MACROFILE = sun.cf - RM_CMD = $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut - - IMAKE_DEFINES = - - IRULESRC = $(CONFIGDIR) - IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) - - ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/Imake.rules \ - $(IRULESRC)/Project.tmpl $(IRULESRC)/site.def \ - $(IRULESRC)/$(MACROFILE) $(EXTRA_ICONFIGFILES) - -########################################################################### -# X Window System Build Parameters -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - -########################################################################### -# X Window System make variables; this need to be coordinated with rules -# $XConsortium: Project.tmpl,v 1.63 89/12/18 16:46:44 jim Exp $ - - PATHSEP = / - USRLIBDIR = $(DESTDIR)/usr/lib - BINDIR = $(DESTDIR)/usr/bin/X11 - INCROOT = $(DESTDIR)/usr/include - BUILDINCROOT = $(TOP) - BUILDINCDIR = $(BUILDINCROOT)/X11 - BUILDINCTOP = .. - INCDIR = $(INCROOT)/X11 - ADMDIR = $(DESTDIR)/usr/adm - LIBDIR = $(USRLIBDIR)/X11 - CONFIGDIR = $(LIBDIR)/config - LINTLIBDIR = $(USRLIBDIR)/lint - - FONTDIR = $(LIBDIR)/fonts - XINITDIR = $(LIBDIR)/xinit - XDMDIR = $(LIBDIR)/xdm - AWMDIR = $(LIBDIR)/awm - TWMDIR = $(LIBDIR)/twm - GWMDIR = $(LIBDIR)/gwm - MANPATH = $(DESTDIR)/usr/man - MANSOURCEPATH = $(MANPATH)/man - MANDIR = $(MANSOURCEPATH)n - LIBMANDIR = $(MANSOURCEPATH)3 - XAPPLOADDIR = $(LIBDIR)/app-defaults - - SOXLIBREV = 4.2 - SOXTREV = 4.0 - SOXAWREV = 4.0 - SOOLDXREV = 4.0 - SOXMUREV = 4.0 - SOXEXTREV = 4.0 - - FONTCFLAGS = -t - - INSTAPPFLAGS = $(INSTDATFLAGS) - - IMAKE = imake - DEPEND = makedepend - RGB = rgb - FONTC = bdftosnf - MKFONTDIR = mkfontdir - MKDIRHIER = /bin/sh $(BINDIR)/mkdirhier.sh - - CONFIGSRC = $(TOP)/config - CLIENTSRC = $(TOP)/clients - DEMOSRC = $(TOP)/demos - LIBSRC = $(TOP)/lib - FONTSRC = $(TOP)/fonts - INCLUDESRC = $(TOP)/X11 - SERVERSRC = $(TOP)/server - UTILSRC = $(TOP)/util - SCRIPTSRC = $(UTILSRC)/scripts - EXAMPLESRC = $(TOP)/examples - CONTRIBSRC = $(TOP)/../contrib - DOCSRC = $(TOP)/doc - RGBSRC = $(TOP)/rgb - DEPENDSRC = $(UTILSRC)/makedepend - IMAKESRC = $(CONFIGSRC) - XAUTHSRC = $(LIBSRC)/Xau - XLIBSRC = $(LIBSRC)/X - XMUSRC = $(LIBSRC)/Xmu - TOOLKITSRC = $(LIBSRC)/Xt - AWIDGETSRC = $(LIBSRC)/Xaw - OLDXLIBSRC = $(LIBSRC)/oldX - XDMCPLIBSRC = $(LIBSRC)/Xdmcp - BDFTOSNFSRC = $(FONTSRC)/bdftosnf - MKFONTDIRSRC = $(FONTSRC)/mkfontdir - EXTENSIONSRC = $(TOP)/extensions - - DEPEXTENSIONLIB = - EXTENSIONLIB = -lXext - - DEPXLIB = $(DEPEXTENSIONLIB) - XLIB = $(EXTENSIONLIB) -lX11 - - DEPXAUTHLIB = $(USRLIBDIR)/libXau.a - XAUTHLIB = -lXau - - DEPXMULIB = - XMULIB = -lXmu - - DEPOLDXLIB = - OLDXLIB = -loldX - - DEPXTOOLLIB = - XTOOLLIB = -lXt - - DEPXAWLIB = - XAWLIB = -lXaw - - LINTEXTENSIONLIB = $(USRLIBDIR)/llib-lXext.ln - LINTXLIB = $(USRLIBDIR)/llib-lX11.ln - LINTXMU = $(USRLIBDIR)/llib-lXmu.ln - LINTXTOOL = $(USRLIBDIR)/llib-lXt.ln - LINTXAW = $(USRLIBDIR)/llib-lXaw.ln - - DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) - - DEPLIBS1 = $(DEPLIBS) - DEPLIBS2 = $(DEPLIBS) - DEPLIBS3 = $(DEPLIBS) - -########################################################################### -# Imake rules for building libraries, programs, scripts, and data files -# rules: $XConsortium: Imake.rules,v 1.67 89/12/18 17:14:15 jim Exp $ - -########################################################################### -# start of Imakefile - -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -TK_WWW_SOURCE_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/Tcl - -TK_WWW_INSTALL_PATH=/a/dxcern/userd/tbl/hypertext/WWW/TkWWW/$(WWW_MACH) - -TK_WWW_HOME_PAGE=http://www.w3.org/default.html -TK_WWW_START_PAGE=$(TK_WWW_HOME_PAGE) - -CC = gcc -fno-builtin -Wall - -CDEBUGFLAGS = -O3 -pipe - -COMPATFLAGS = -I/afs/athena.mit.edu/course/other/cdsdev/www-compat -CCOPTIONS = - -BINDIR = $(TK_WWW_INSTALL_PATH) - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix_x - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = /tmp - -# 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 clean Remove intermediate files - -WC = $(WWW)/Library -CMN = $(WWW)/Library/Implementation/ - -# Where shall we put the objects and built library? - -LOB = $(WTMP)/Library/$(WWW_MACH) - -# Bug: This path, if relative, is taken relative to the directory -# in which this makefile is, not the pwd. This screws up the -# recursive invocation - -VC = 2.14 - -CFLAGS2 = $(CFLAGS) -I$(CMN) - -CERNLIBBIN = $(WWW)/bin - -COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ - $(LOB)/HTFile.o $(LOB)/HTFTP.o $(LOB)/HTTCP.o \ - $(LOB)/SGML.o $(LOB)/HTMLDTD.o $(LOB)/HTChunk.o \ - $(LOB)/HTPlain.o $(LOB)/HTWriter.o $(LOB)/HTFWriter.o \ - $(LOB)/HTMLGen.o \ - $(LOB)/HTAtom.o $(LOB)/HTAnchor.o $(LOB)/HTStyle.o \ - $(LOB)/HTList.o $(LOB)/HTString.o $(LOB)/HTAlert.o \ - $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTInit.o $(LOB)/HTMIME.o \ - $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTWSRC.o $(HTWAIS) - -CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ - $(CMN)HTFTP.c $(CMN)HTTCP.c $(CMN)SGML.c \ - $(CMN)HTMLDTD.c \ - $(CMN)HTPlain.c $(CMN)HTWriter.c $(CMN)HTFWriter.c $(CMN)HTMLGen.c \ - $(CMN)HTChunk.c $(CMN)HTAtom.c $(CMN)HTAnchor.c $(CMN)HTStyle.c \ - $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTAlert.c $(CMN)HTRules.c \ - $(CMN)HTFormat.c $(CMN)HTInit.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ - $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTWAIS.c $(CMN)HTWSRC.c - -HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.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)WWW.h $(CMN)HText.h \ - $(CMN)HTTelnet.h \ - $(CMN)HTWAIS.h $(CMN)HTWSRC.h - -SOURCES = $(CFILES) $(HFILES) $(CMN)Version.make $(CMN)CommonMakefile \ - $(WWW)/README.txt $(WWW)/Copyright.txt $(WWW)/BUILD -SPECIFIC = $(WWW)/All - -# Library -# -# On SGI, ranlib is unnecessary and does not exist so we ignore errors -# for that step -all: $(LOB)/libwww.a - $(MV) $(LOB)/libwww.a $(WC)/$(WWW_MACH) - -$(LOB)/libwww.a : $(COMMON) - ar r $(LOB)/libwww.a $(COMMON) - -ranlib $(LOB)/libwww.a - -# Clean up everything generatable except final products -clean :: - $(RM) $(LOB) - -# Clean up everything generatable including final products - -cleanall :: clean - $(RM) $(LOB)/libwww.a - -# Common code -# ----------- - -# Directory for object files - .created checks it exists - -OE = $(LOB)/.created -$(OE) : - -mkdir $(WTMP) - -mkdir $(WTMP)/Library - -mkdir $(WTMP)/Library/$(WWW_MACH) - 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)/HTInit.o : $(OE) $(CMN)HTInit.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTInit.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 - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTNews.c - -$(LOB)/HTGopher.o : $(OE) $(CMN)HTGopher.c $(CMN)HTUtils.h $(CMN)HTList.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTGopher.c - -$(LOB)/HTTelnet.o : $(OE) $(CMN)HTTelnet.c $(CMN)HTUtils.h $(CMN)HTTelnet.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTTelnet.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 - $(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)/HTAlert.o : $(OE) $(CMN)HTAlert.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTAlert.c - -$(LOB)/HTRules.o : $(OE) $(CMN)HTRules.c $(CMN)HTUtils.h $(CMN)Version.make - $(CC) -c -o $@ $(CFLAGS2) -DVC=\"$(VC)\" $(CMN)HTRules.c - -$(LOB)/SGML.o : $(OE) $(CMN)SGML.c $(CMN)HTUtils.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 - $(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 - -$(LOB)/HTFWriter.o : $(OE) $(CMN)HTFWriter.c $(CMN)HTFWriter.h $(CMN)HTStream.h - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFWriter.c - -# Communications & Files - -$(LOB)/HTTP.o : $(OE) $(CMN)HTTP.c $(CMN)HTUtils.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 - $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTFile.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 - -########################################################################### -# common rules for all Makefiles - do not edit - -emptyrule:: - -clean:: - $(RM_CMD) \#* - -Makefile:: - -@if [ -f Makefile ]; then \ - echo " $(RM) Makefile.bak; $(MV) Makefile Makefile.bak"; \ - $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ - else exit 0; fi - $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) - -tags:: - $(TAGS) -w *.[ch] - $(TAGS) -xw *.[ch] > TAGS - -saber: - #load $(ALLDEFINES) $(SRCS) - -osaber: - #load $(ALLDEFINES) $(OBJS) - -########################################################################### -# empty rules for directories that do not have SUBDIRS - do not edit - -install:: - @echo "install in $(CURRENT_DIR) done" - -install.man:: - @echo "install.man in $(CURRENT_DIR) done" - -Makefiles:: - -includes:: - -########################################################################### -# dependencies generated by makedepend - diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 9cb24f56..c18e0680 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -21,12 +21,9 @@ #include "SGML.h" #include "HTMLDTD.h" #include "HTCJK.h" -#ifdef EXP_CHARTRANS #include "UCMap.h" #include "UCDefs.h" #include "UCAux.h" -#endif - #include <ctype.h> /*#include <stdio.h> included in HTUtils.h -- FM */ @@ -133,7 +130,6 @@ struct _HTStream { int csi_index; } ; -#ifdef EXP_CHARTRANS PRIVATE void set_chartrans_handling ARGS3( HTStream *, context, @@ -203,14 +199,11 @@ PRIVATE void change_chartrans_handling ARGS1( } } } -#endif /* EXP_CHARTRANS */ #define PUTC(ch) ((*context->actions->put_character)(context->target, ch)) -#ifdef EXP_CHARTRANS #define PUTUTF8(code) (UCPutUtf8_charstring((HTStream *)context->target, \ (putc_func_t*)(context->actions->put_character), code)) -#endif extern BOOL historical_comments; extern BOOL minimal_comments; @@ -295,7 +288,6 @@ PRIVATE void handle_attribute_value ARGS2( context->current_attribute_number = INVALID; /* can't have two assignments! */ } -#ifdef EXP_CHARTRANS /* translate some Unicodes to Lynx special codes and output them. */ PRIVATE BOOL put_special_unicodes ARGS2( HTStream *, context, @@ -332,7 +324,6 @@ PRIVATE BOOL put_special_unicodes ARGS2( */ return YES; } -#endif /* Handle entity ** ------------- @@ -1058,14 +1049,12 @@ PRIVATE void start_element ARGS1( N->tag = new_tag; context->element_stack = N; } -#ifdef EXP_CHARTRANS else if (!strcasecomp(new_tag->name, "META")) { /* ** Check for result of META tag. - KW & FM */ change_chartrans_handling(context); } -#endif /* EXP_CHARTRANS */ } @@ -1371,12 +1360,10 @@ PRIVATE void SGML_character ARGS2( ** or unsign_c and c will have to be passed raw. - KW */ top: -#ifdef EXP_CHARTRANS saved_char_in = '\0'; top0a: *(context->utf_buf) = '\0'; clong = (unsigned char)c; -#endif top1: /* ** Ignore low ISO 646 7-bit control characters @@ -1391,11 +1378,7 @@ top1: ** Ignore 127 if we don't have HTPassHighCtrlRaw ** or HTCJK set. - FM */ -#ifndef EXP_CHARTRANS -#define PASSHICTRL HTPassHighCtrlRaw -#else #define PASSHICTRL (context->T.transp || unsign_c >= LYlowest_eightbit[context->in_char_set]) -#endif /* EXP_CHARTRANS */ if (c == 127 && !(PASSHICTRL || HTCJK != NOCJK)) return; @@ -1457,11 +1440,7 @@ top1: context->element_stack->tag->contents == SGML_LITTERAL) ? S_litteral : S_tag; -#ifndef EXP_CHARTRANS -#define PASS8859SPECL HTPassHighCtrlRaw -#else #define PASS8859SPECL context->T.pass_160_173_raw -#endif /* EXP_CHARTRANS */ /* ** Convert 160 (nbsp) to Lynx special character if ** neither HTPassHighCtrlRaw nor HTCJK is set. - FM @@ -1524,11 +1503,7 @@ top1: ** have the "ISO Latin 1" character set selected, ** back translate for our character set. - FM */ -#ifndef EXP_CHARTRANS -#define PASSHI8BIT HTPassEightBitRaw -#else #define PASSHI8BIT (HTPassEightBitRaw || (context->T.do_8bitraw && !context->T.trans_from_uni)) -#endif /* EXP_CHARTRANS */ } else if (unsign_c > 160 && unsign_c < 256 && !(PASSHI8BIT || HTCJK != NOCJK) && !IncludesLatin1Enc(context->html_char_set)) { @@ -1545,7 +1520,6 @@ top1: string->size = 0; if (!FoundEntity) PUTC(';'); -#ifdef EXP_CHARTRANS /* ** If we get to here and have an ASCII char, pass the character. */ @@ -1578,7 +1552,6 @@ top1: sprintf(replace_buf, "U%.2lX", unsign_c); for (p = replace_buf; *p; p++) PUTC(*p); -#endif /* EXP_CHARTRANS */ /* ** If we get to here, pass the character. - FM */ @@ -1922,7 +1895,6 @@ top1: context->state = S_text; break; } -#ifdef EXP_CHARTRANS if (value == 160 || value == 173) { /* ** We *always* should interpret these as Latin1 here! @@ -1982,7 +1954,6 @@ top1: PUTUTF8(value)) { /* do nothing more */ ; } else -#endif /* EXP_CHARTRANS */ if (value == 8482) { /* ** trade Handle as named entity. - FM @@ -2641,7 +2612,6 @@ top1: break; } else context->state = S_tag_gap; -#ifdef EXP_CHARTRANS } else if (context->T.decode_utf8 && *context->utf_buf) { HTChunkPuts(string, context->utf_buf); @@ -2659,7 +2629,6 @@ top1: } } else if (saved_char_in && context->T.use_raw_char_in) { HTChunkPutc(string, saved_char_in); -#endif /* EXP_CHARTRANS */ } else { HTChunkPutc(string, c); } @@ -2678,7 +2647,6 @@ top1: */ context->state = S_esc_sq; HTChunkPutc(string, c); -#ifdef EXP_CHARTRANS } else if (context->T.decode_utf8 && *context->utf_buf) { HTChunkPuts(string, context->utf_buf); @@ -2696,7 +2664,6 @@ top1: } } else if (saved_char_in && context->T.use_raw_char_in) { HTChunkPutc(string, saved_char_in); -#endif /* EXP_CHARTRANS */ } else { HTChunkPutc(string, c); } @@ -2719,7 +2686,6 @@ top1: */ context->state = S_esc_dq; HTChunkPutc(string, c); -#ifdef EXP_CHARTRANS } else if (context->T.decode_utf8 && *context->utf_buf) { HTChunkPuts(string, context->utf_buf); @@ -2737,7 +2703,6 @@ top1: } } else if (saved_char_in && context->T.use_raw_char_in) { HTChunkPutc(string, saved_char_in); -#endif /* EXP_CHARTRANS */ } else { HTChunkPutc(string, c); } @@ -3182,7 +3147,6 @@ PUBLIC HTStream* SGML_new ARGS3( context->second_bracket = FALSE; context->isHex = FALSE; -#ifdef EXP_CHARTRANS context->node_anchor = anchor; /*only for chartrans info. could be NULL? */ context->utf_count = 0; @@ -3199,7 +3163,6 @@ PUBLIC HTStream* SGML_new ARGS3( } context->UCI=HTAnchor_getUCInfoStage(anchor, UCT_STAGE_PARSER); set_chartrans_handling(context, anchor, -1); -#endif /* EXP_CHARTRANS */ context->recover = NULL; context->recover_index = 0; diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h index 645bf266..30f0d170 100644 --- a/WWW/Library/Implementation/SGML.h +++ b/WWW/Library/Implementation/SGML.h @@ -132,22 +132,18 @@ struct _tag{ ** ** Not the whole DTD, but all this parser uses of it. */ -#ifdef EXP_CHARTRANS typedef struct { char* name; long code; } UC_entity_info; -#endif typedef struct { HTTag * tags; /* Must be in strcmp order by name */ int number_of_tags; CONST char ** entity_names; /* Must be in strcmp order by name */ int number_of_entities; -#ifdef EXP_CHARTRANS CONST UC_entity_info * extra_entity_info; /* strcmp order by name */ int number_of_extra_entities; -#endif } SGML_dtd; diff --git a/WWW/Library/unix/Makefile b/WWW/Library/unix/Makefile deleted file mode 100644 index 5fea7dd7..00000000 --- a/WWW/Library/unix/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# Make WWW under unix for a.n.other unix system (bsd) -# Use this as a template - -# For W3 distribution, machine type for subdirectories -WWW_MACH = unix - -# The ASIS repository's name for the machine we are on -ASIS_MACH = hardware/os - - -CFLAGS = -g -DDEBUG -LFLAGS = -CC = cc - -# Directory for installed binary: -BINDIR = /usr/local/bin - -# Where is the W3 object library to be installed (not normally done)? -LIBDIR = $(WWW)/Library/Implementation/$(WWW_MACH) - -#_________________ OK if normal W3 distribution -# Where is the WWW source root? -WWW = ../.. - -# Where should temporary (object) files go? -WTMP = ../.. - - -include $(WWW)/Library/Implementation/Version.make -include $(WWW)/Library/Implementation/CommonMakefile diff --git a/WWW/Library/vms/libmake.com b/WWW/Library/vms/libmake.com index 83ac1b4d..96223f00 100644 --- a/WWW/Library/vms/libmake.com +++ b/WWW/Library/vms/libmake.com @@ -87,13 +87,13 @@ $! $ cc/decc/prefix=all /nomember 'cc_opts'- /warning=(disable=implicitfunc)- /DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra',VC="""2.14""")- - /INCLUDE=([-.Implementation]) - + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) - [-.Implementation]HTString.c $! $ cc := cc/decc/prefix=all /nomember 'cc_opts'- /warning=(disable=implicitfunc)- /DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra')- - /INCLUDE=([-.Implementation]) + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) $! $ v1 = 'f$verify(0)' $ Else @@ -104,13 +104,13 @@ $! $ cc/decc/prefix=ansi /nomember 'cc_opts'- /warning=(disable=implicitfunc)- /DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra',VC="""2.14""")- - /INCLUDE=([-.Implementation]) - + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) - [-.Implementation]HTString.c $! $ cc := cc/decc/prefix=ansi /nomember 'cc_opts'- /warning=(disable=implicitfunc)- /DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra')- - /INCLUDE=([-.Implementation]) + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) $! $ v1 = 'f$verify(0)' $ EndIf @@ -121,11 +121,11 @@ $ v1 = f$verify(1) $! GNUC: $! $ gcc/DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra',VC="""2.14""") 'cc_opts'- - /INCLUDE=([-.Implementation]) - + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) - [-.Implementation]HTString.c $! $ cc := gcc/DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra') 'cc_opts'- - /INCLUDE=([-.Implementation]) + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) $! $ v1 = 'f$verify(0)' $ ELSE @@ -133,11 +133,11 @@ $ v1 = f$verify(1) $! VAXC: $! $ cc/DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra',VC="""2.14""") 'cc_opts'- - /INCLUDE=([-.Implementation]) - + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) - [-.Implementation]HTString.c $! $ cc := cc/DEFINE=(DEBUG,ACCESS_AUTH,'transport''extra') 'cc_opts'- - /INCLUDE=([-.Implementation]) + /INCLUDE=([-.Implementation],[---.src],[---.src.chrtrans],[---]) $! $ v1 = 'f$verify(0)' $ ENDIF |