diff options
Diffstat (limited to 'src')
76 files changed, 946 insertions, 897 deletions
diff --git a/src/AttrList.h b/src/AttrList.h index bc5710db..cacb02e4 100644 --- a/src/AttrList.h +++ b/src/AttrList.h @@ -1,8 +1,8 @@ #if !defined(__ATTRLIST_H) #define __ATTRLIST_H -#include "HText.h" -#include "HTMLDTD.h" +#include <HText.h> +#include <HTMLDTD.h> #define TEMPSTRINGSIZE 256 diff --git a/src/DefaultStyle.c b/src/DefaultStyle.c index 7299ede1..bff1b11d 100644 --- a/src/DefaultStyle.c +++ b/src/DefaultStyle.c @@ -3,12 +3,12 @@ ** The dimensions are all in characters! */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTStyle.h" -#include "HTFont.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTStyle.h> +#include <HTFont.h> -#include "LYLeaks.h" +#include <LYLeaks.h> /* Tab arrays: */ diff --git a/src/GridText.c b/src/GridText.c index 160b5fe9..0e489dbb 100644 --- a/src/GridText.c +++ b/src/GridText.c @@ -2,18 +2,18 @@ ** =============================== */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTString.h" -#include "HTFont.h" -#include "HTAccess.h" -#include "HTAnchor.h" -#include "HTParse.h" -#include "HTTP.h" -#include "HTAlert.h" -#include "HTCJK.h" -#include "UCDefs.h" -#include "UCAux.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTString.h> +#include <HTFont.h> +#include <HTAccess.h> +#include <HTAnchor.h> +#include <HTParse.h> +#include <HTTP.h> +#include <HTAlert.h> +#include <HTCJK.h> +#include <UCDefs.h> +#include <UCAux.h> #include <assert.h> #include <ctype.h> @@ -23,29 +23,29 @@ #endif /* SYSLOG_REQUESTED_URLS */ #endif /* !VMS */ -#include "GridText.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYStructs.h" -#include "LYGlobalDefs.h" -#include "LYGetFile.h" -#include "LYSignal.h" -#include "LYMail.h" -#include "LYList.h" -#include "LYCharSets.h" -#include "LYCharUtils.h" /* LYUCTranslateBack... */ -#include "UCMap.h" +#include <GridText.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYStructs.h> +#include <LYGlobalDefs.h> +#include <LYGetFile.h> +#include <LYSignal.h> +#include <LYMail.h> +#include <LYList.h> +#include <LYCharSets.h> +#include <LYCharUtils.h> /* LYUCTranslateBack... */ +#include <UCMap.h> #ifdef EXP_CHARTRANS_AUTOSWITCH -#include "UCAuto.h" +#include <UCAuto.h> #endif /* EXP_CHARTRANS_AUTOSWITCH */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #ifdef USE_COLOR_STYLE -#include "AttrList.h" -#include "LYHash.h" +#include <AttrList.h> +#include <LYHash.h> unsigned int cached_styles[CACHEH][CACHEW]; diff --git a/src/GridText.h b/src/GridText.h index 42a50c0c..265cadd7 100644 --- a/src/GridText.h +++ b/src/GridText.h @@ -4,10 +4,10 @@ #ifndef LYGRIDTEXT_H #define LYGRIDTEXT_H -#include "HText.h" /* Superclass */ +#include <HText.h> /* Superclass */ #ifndef HTFORMS_H -#include "HTForms.h" +#include <HTForms.h> #endif /* HTFORMS_H */ #define LY_UNDERLINE_START_CHAR '\003' diff --git a/src/HTAlert.c b/src/HTAlert.c index 0886d81e..74d8d2b8 100644 --- a/src/HTAlert.c +++ b/src/HTAlert.c @@ -9,18 +9,18 @@ ** */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAlert.h" -#include "LYGlobalDefs.h" -#include "LYCurses.h" -#include "LYStrings.h" -#include "LYUtils.h" -#include "LYSignal.h" -#include "GridText.h" -#include "LYCookie.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAlert.h> +#include <LYGlobalDefs.h> +#include <LYCurses.h> +#include <LYStrings.h> +#include <LYUtils.h> +#include <LYSignal.h> +#include <GridText.h> +#include <LYCookie.h> + +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/HTAlert.h b/src/HTAlert.h index ce40afb5..b35267b6 100644 --- a/src/HTAlert.h +++ b/src/HTAlert.h @@ -8,9 +8,9 @@ */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "tcp.h" +#include <tcp.h> /* Display a message and get the input ** diff --git a/src/HTFWriter.c b/src/HTFWriter.c index a5390387..9e91704b 100644 --- a/src/HTFWriter.c +++ b/src/HTFWriter.c @@ -8,34 +8,34 @@ ** strings written must be less than buffer size. */ -#include "HTUtils.h" -#include "tcp.h" -#include "LYCurses.h" -#include "HTFWriter.h" -#include "HTSaveToFile.h" - -#include "HTFormat.h" -#include "UCDefs.h" -#include "HTAlert.h" -#include "HTFile.h" -#include "HTPlain.h" -#include "HTFile.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYCurses.h> +#include <HTFWriter.h> +#include <HTSaveToFile.h> + +#include <HTFormat.h> +#include <UCDefs.h> +#include <HTAlert.h> +#include <HTFile.h> +#include <HTPlain.h> +#include <HTFile.h> #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif -#include "LYStrings.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYSystem.h" -#include "GridText.h" -#include "LYexit.h" -#include "LYLeaks.h" -#include "LYKeymap.h" +#include <LYStrings.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYSystem.h> +#include <GridText.h> +#include <LYexit.h> +#include <LYLeaks.h> +#include <LYKeymap.h> PUBLIC char * WWW_Download_File=NULL; /* contains the name of the temp file ** which is being downloaded into diff --git a/src/HTForms.h b/src/HTForms.h index 3d6f608d..c01d3df1 100644 --- a/src/HTForms.h +++ b/src/HTForms.h @@ -3,7 +3,7 @@ #define HTFORMS_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ /* in LYForms.c */ diff --git a/src/HTInit.c b/src/HTInit.c index 3b15191c..807df2fd 100644 --- a/src/HTInit.c +++ b/src/HTInit.c @@ -6,30 +6,30 @@ ** ------------------------------------------------ */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> /* Implements: */ -#include "HTInit.h" - -#include "HTML.h" -#include "HTPlain.h" -#include "HTMLGen.h" -#include "HTFile.h" -#include "HTFormat.h" -#include "HTMIME.h" -#include "HTWSRC.h" - -#include "HTSaveToFile.h" /* LJM */ -#include "userdefs.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYSystem.h" - -#include "LYexit.h" -#include "LYLeaks.h" +#include <HTInit.h> + +#include <HTML.h> +#include <HTPlain.h> +#include <HTMLGen.h> +#include <HTFile.h> +#include <HTFormat.h> +#include <HTMIME.h> +#include <HTWSRC.h> + +#include <HTSaveToFile.h> /* LJM */ +#include <userdefs.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYSystem.h> + +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/HTML.c b/src/HTML.c index 14a11eff..c456d6e5 100644 --- a/src/HTML.c +++ b/src/HTML.c @@ -11,56 +11,56 @@ ** Being Overidden ** */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> #define Lynx_HTML_Handler -#include "HTChunk.h" -#include "HText.h" -#include "HTStyle.h" -#include "HTML.h" - -#include "HTCJK.h" -#include "HTAtom.h" -#include "HTAnchor.h" -#include "HTMLGen.h" -#include "HTParse.h" -#include "HTList.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "UCAux.h" - -#include "LYGlobalDefs.h" -#include "LYCharUtils.h" -#include "LYCharSets.h" - -#include "HTAlert.h" -#include "HTFont.h" -#include "HTForms.h" -#include "HTNestedList.h" -#include "GridText.h" -#include "LYSignal.h" -#include "LYUtils.h" -#include "LYMap.h" -#include "LYList.h" -#include "LYBookmark.h" +#include <HTChunk.h> +#include <HText.h> +#include <HTStyle.h> +#include <HTML.h> + +#include <HTCJK.h> +#include <HTAtom.h> +#include <HTAnchor.h> +#include <HTMLGen.h> +#include <HTParse.h> +#include <HTList.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <UCAux.h> + +#include <LYGlobalDefs.h> +#include <LYCharUtils.h> +#include <LYCharSets.h> + +#include <HTAlert.h> +#include <HTFont.h> +#include <HTForms.h> +#include <HTNestedList.h> +#include <GridText.h> +#include <LYSignal.h> +#include <LYUtils.h> +#include <LYMap.h> +#include <LYList.h> +#include <LYBookmark.h> #ifdef VMS -#include "LYCurses.h" -#include "HTVMSUtils.h" +#include <LYCurses.h> +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef USE_COLOR_STYLE -#include "AttrList.h" -#include "LYHash.h" -#include "LYStyle.h" +#include <AttrList.h> +#include <LYHash.h> +#include <LYStyle.h> #undef SELECTED_STYLES #define pHText_changeStyle(X,Y,Z) {} char Style_className[16384]; #endif -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -81,7 +81,7 @@ PRIVATE HTStyleSheet * styleSheet; /* Application-wide */ /* Module-wide style cache */ -PUBLIC HTStyle *styles[HTML_ELEMENTS+31]; /* adding 24 nested list styles */ +PUBLIC HTStyle *styles[HTML_ELEMENTS+31]; /* adding 24 nested list styles */ /* and 3 header alignment styles */ /* and 3 div alignment styles */ PRIVATE HTStyle *default_style; @@ -105,6 +105,14 @@ PRIVATE void get_styles NOPARAMS; PRIVATE void change_paragraph_style PARAMS((HTStructured * me, HTStyle * style)); +/* + * If we have verbose_img set, display labels for images. + */ +#define VERBOSE_IMG(value,string) \ + ((verbose_img) ? (newtitle = MakeNewTitle(value)): string) + +PRIVATE char * MakeNewTitle(CONST char ** value); + /* Set an internal flag that the next call to a stack-affecting method ** is only internal and the stack manipulation should be skipped. - kw */ @@ -601,6 +609,7 @@ PRIVATE void HTML_start_element ARGS6( { char *alt_string = NULL; char *id_string = NULL; + char *newtitle = NULL; char *href = NULL; char *map_href = NULL; char *title = NULL; @@ -1143,7 +1152,7 @@ PRIVATE void HTML_start_element ARGS6( /* * Lynx was supporting ACTION, which never made it into - * the HTML 2.0 specs. HTML 3.0 uses HREF, so we'll + * the HTML 2.0 specs. HTML 3.0 uses HREF, so we'll * use that too, but allow use of ACTION as an alternate * until people have fully switched over. - FM */ @@ -2724,7 +2733,7 @@ PRIVATE void HTML_start_element ARGS6( *value[HTML_IMG_ALT] != '\0'))) { StrAllocCopy(alt_string, value[HTML_IMG_ALT]); TRANSLATE_AND_UNESCAPE_ENTITIES(&alt_string, - me->UsePlainSpace, me->HiddenValue); + me->UsePlainSpace, me->HiddenValue); /* * If it's all spaces and we are making SRC or * USEMAP links, treat it as zero-length. - FM @@ -2739,14 +2748,19 @@ PRIVATE void HTML_start_element ARGS6( } else if (dest_ismap) { StrAllocCopy(alt_string, (title ? title : "[ISMAP]")); + } else if (me->inA == TRUE && dest) { StrAllocCopy(alt_string, (title ? - title : "[LINK]")); + title : + VERBOSE_IMG(value, "[LINK]"))); + } else { StrAllocCopy(alt_string, (title ? title : - (present[HTML_IMG_ISOBJECT] ? - "(OBJECT)" : "[INLINE]"))); + ((present && + present[HTML_IMG_ISOBJECT]) ? + "(OBJECT)" : + VERBOSE_IMG(value, "[INLINE]")))); } } } @@ -2762,14 +2776,16 @@ PRIVATE void HTML_start_element ARGS6( } else if (me->inA == TRUE && dest) { StrAllocCopy(alt_string, (title ? - title : "[LINK]")); + title : + VERBOSE_IMG(value, "[LINK]"))); } else { if (pseudo_inline_alts || clickable_images) StrAllocCopy(alt_string, (title ? title : ((present && present[HTML_IMG_ISOBJECT]) ? - "(OBJECT)" : "[INLINE]"))); + "(OBJECT)" : + VERBOSE_IMG(value, "[INLINE]")))); else StrAllocCopy(alt_string, (title ? title : "")); @@ -2900,7 +2916,8 @@ PRIVATE void HTML_start_element ARGS6( ((present && present[HTML_IMG_ISOBJECT]) ? ((map_href || dest_ismap) ? - "(IMAGE)" : "(OBJECT)") : "[IMAGE]")); + "(IMAGE)" : "(OBJECT)") : + VERBOSE_IMG(value, "[IMAGE]"))); if (id_string && !map_href) { if ((ID_A = HTAnchor_findChildAndLink( me->node_anchor, /* Parent */ @@ -2954,7 +2971,8 @@ PRIVATE void HTML_start_element ARGS6( StrAllocCopy(alt_string, ((present && present[HTML_IMG_ISOBJECT]) ? - "(IMAGE)" : "[IMAGE]")); + "(IMAGE)" : + VERBOSE_IMG(value, "[IMAGE]"))); } else { HTML_put_character(me, ' '); /* space char may be ignored */ me->in_word = NO; @@ -3080,6 +3098,7 @@ PRIVATE void HTML_start_element ARGS6( FREE(alt_string); FREE(id_string); FREE(title); + FREE(newtitle); dest = NULL; dest_ismap = FALSE; break; @@ -4437,7 +4456,7 @@ PRIVATE void HTML_start_element ARGS6( HText_beginAnchor(me->text, me->inUnderline, me->CurrentA); if (me->inBoldH == FALSE) HText_appendCharacter(me->text, LY_BOLD_START_CHAR); - HTML_put_string(me, "[IMAGE]"); + HTML_put_string(me, VERBOSE_IMG(value, "[IMAGE]")); if (me->inBoldH == FALSE) HText_appendCharacter(me->text, LY_BOLD_END_CHAR); HText_endAnchor(me->text, 0); @@ -5636,7 +5655,7 @@ PRIVATE void HTML_end_element ARGS3( case HTML_P: LYHandleP(me, - (CONST BOOL*)0, (CONST char **)0, + (CONST BOOL*)0, (CONST char **)0, (char **)&include, FALSE); break; @@ -7489,3 +7508,20 @@ PUBLIC int HTLoadError ARGS3( HTAlert(message); /* @@@@@@@@@@@@@@@@@@@ */ return -number; } + + +PRIVATE char * MakeNewTitle(CONST char ** value) +{ + char *ptr; + char *newtitle = NULL; + + StrAllocCopy(newtitle, "["); + ptr = strrchr(value[HTML_IMG_SRC], '/'); + if (!ptr) { + StrAllocCat(newtitle, value[HTML_IMG_SRC]); + } else { + StrAllocCat(newtitle, ptr + 1); + } + StrAllocCat(newtitle, "]"); + return newtitle; +} diff --git a/src/HTML.h b/src/HTML.h index d75a10bd..8a5ee014 100644 --- a/src/HTML.h +++ b/src/HTML.h @@ -8,12 +8,12 @@ #define HTML_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "UCDefs.h" -#include "UCAux.h" -#include "HTAnchor.h" -#include "HTMLDTD.h" +#include <UCDefs.h> +#include <UCAux.h> +#include <HTAnchor.h> +#include <HTMLDTD.h> #ifdef SHORT_NAMES #define HTMLPresentation HTMLPren diff --git a/src/LYBookmark.c b/src/LYBookmark.c index e43f337b..5ce5c754 100644 --- a/src/LYBookmark.c +++ b/src/LYBookmark.c @@ -1,27 +1,27 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAlert.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYBookmark.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYSystem.h" -#include "LYKeymap.h" -#include "LYCharUtils.h" -#include "LYCurses.h" -#include "GridText.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAlert.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYBookmark.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYSystem.h> +#include <LYKeymap.h> +#include <LYCharUtils.h> +#include <LYCurses.h> +#include <GridText.h> #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #include <nam.h> extern BOOLEAN HadVMSInterrupt; /* Flag from cleanup_sig() AST */ #endif /* VMS */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYBookmark.h b/src/LYBookmark.h index ee642be2..e4898c71 100644 --- a/src/LYBookmark.h +++ b/src/LYBookmark.h @@ -3,7 +3,7 @@ #define LYBOOKMARK_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern char * get_bookmark_filename PARAMS((char **name)); diff --git a/src/LYCgi.c b/src/LYCgi.c index c1840e74..9a6ab780 100644 --- a/src/LYCgi.c +++ b/src/LYCgi.c @@ -23,30 +23,30 @@ ** nph- script. */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTTP.h" -#include "HTParse.h" -#include "HTTCP.h" -#include "HTFormat.h" -#include "HTFile.h" -#include "HTAlert.h" -#include "HTMIME.h" -#include "HTAABrow.h" - -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "HTML.h" -#include "HTInit.h" -#include "LYGetFile.h" -#include "LYBookmark.h" -#include "GridText.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTTP.h> +#include <HTParse.h> +#include <HTTCP.h> +#include <HTFormat.h> +#include <HTFile.h> +#include <HTAlert.h> +#include <HTMIME.h> +#include <HTAABrow.h> + +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <HTML.h> +#include <HTInit.h> +#include <LYGetFile.h> +#include <LYBookmark.h> +#include <GridText.h> #include <ctype.h> -#include "LYCgi.h" -#include "LYSignal.h" -#include "LYLocal.h" +#include <LYCgi.h> +#include <LYSignal.h> +#include <LYLocal.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYCharSets.c b/src/LYCharSets.c index 0ed8ba64..0e7474bb 100644 --- a/src/LYCharSets.c +++ b/src/LYCharSets.c @@ -1,20 +1,20 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTCJK.h" -#include "HTMLDTD.h" - -#include "LYGlobalDefs.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "LYCharSets.h" -#include "LYCharUtils.h" -#include "HTFont.h" -#include "GridText.h" -#include "LYCurses.h" -#include "LYStrings.h" - -#include "LYexit.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTCJK.h> +#include <HTMLDTD.h> + +#include <LYGlobalDefs.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <LYCharSets.h> +#include <LYCharUtils.h> +#include <HTFont.h> +#include <GridText.h> +#include <LYCurses.h> +#include <LYStrings.h> + +#include <LYexit.h> +#include <LYLeaks.h> extern BOOL HTPassEightBitRaw; extern BOOL HTPassEightBitNum; diff --git a/src/LYCharSets.h b/src/LYCharSets.h index 7af57cdc..ff68dd9b 100644 --- a/src/LYCharSets.h +++ b/src/LYCharSets.h @@ -3,7 +3,7 @@ #define LYCHARSETS_H #ifndef UCMAP_H -#include "UCMap.h" +#include <UCMap.h> #endif /* !UCMAP_H */ extern BOOLEAN LYHaveCJKCharacterSet; diff --git a/src/LYCharUtils.c b/src/LYCharUtils.c index 1f0d325d..e860ce47 100644 --- a/src/LYCharUtils.c +++ b/src/LYCharUtils.c @@ -2,50 +2,50 @@ ** Functions associated with LYCharSets.c and the Lynx version of HTML.c - FM ** ========================================================================== */ -#include "HTUtils.h" -#include "tcp.h" -#include "SGML.h" +#include <HTUtils.h> +#include <tcp.h> +#include <SGML.h> #define Lynx_HTML_Handler -#include "HTChunk.h" -#include "HText.h" -#include "HTStyle.h" -#include "HTMIME.h" -#include "HTML.h" - -#include "HTCJK.h" -#include "HTAtom.h" -#include "HTMLGen.h" -#include "HTParse.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "UCAux.h" - -#include "LYGlobalDefs.h" -#include "LYCharUtils.h" -#include "LYCharSets.h" - -#include "HTAlert.h" -#include "HTFont.h" -#include "HTForms.h" -#include "HTNestedList.h" -#include "GridText.h" -#include "LYSignal.h" -#include "LYUtils.h" -#include "LYMap.h" -#include "LYBookmark.h" -#include "LYCurses.h" -#include "LYCookie.h" +#include <HTChunk.h> +#include <HText.h> +#include <HTStyle.h> +#include <HTMIME.h> +#include <HTML.h> + +#include <HTCJK.h> +#include <HTAtom.h> +#include <HTMLGen.h> +#include <HTParse.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <UCAux.h> + +#include <LYGlobalDefs.h> +#include <LYCharUtils.h> +#include <LYCharSets.h> + +#include <HTAlert.h> +#include <HTFont.h> +#include <HTForms.h> +#include <HTNestedList.h> +#include <GridText.h> +#include <LYSignal.h> +#include <LYUtils.h> +#include <LYMap.h> +#include <LYBookmark.h> +#include <LYCurses.h> +#include <LYCookie.h> #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYCharUtils.h b/src/LYCharUtils.h index 5c8f87ba..fb079332 100644 --- a/src/LYCharUtils.h +++ b/src/LYCharUtils.h @@ -3,7 +3,7 @@ #define LYCHARUTILS_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ #define CHECK_ID(code) LYCheckForID(me, present, value, (int)code) diff --git a/src/LYClean.c b/src/LYClean.c index 424560e6..69b2cdbf 100644 --- a/src/LYClean.c +++ b/src/LYClean.c @@ -1,16 +1,16 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYSignal.h" -#include "LYClean.h" -#include "LYGlobalDefs.h" -#include "LYStrings.h" -#include "LYTraversal.h" -#include "UCAuto.h" - -#include "LYexit.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYSignal.h> +#include <LYClean.h> +#include <LYGlobalDefs.h> +#include <LYStrings.h> +#include <LYTraversal.h> +#include <UCAuto.h> + +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYCookie.c b/src/LYCookie.c index c7e7fe0a..bde4a81d 100644 --- a/src/LYCookie.c +++ b/src/LYCookie.c @@ -44,26 +44,26 @@ * Cookies could be optionally stored in a file from session to session. */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAccess.h" -#include "HTParse.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYSignal.h" -#include "LYUtils.h" -#include "LYCharUtils.h" -#include "LYClean.h" -#include "LYGlobalDefs.h" -#include "LYEdit.h" -#include "LYStrings.h" -#include "LYSystem.h" -#include "GridText.h" -#include "LYUtils.h" -#include "LYCharUtils.h" -#include "LYCookie.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAccess.h> +#include <HTParse.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYSignal.h> +#include <LYUtils.h> +#include <LYCharUtils.h> +#include <LYClean.h> +#include <LYGlobalDefs.h> +#include <LYEdit.h> +#include <LYStrings.h> +#include <LYSystem.h> +#include <GridText.h> +#include <LYUtils.h> +#include <LYCharUtils.h> +#include <LYCookie.h> + +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYCurses.c b/src/LYCurses.c index 9defcfa2..00458ff9 100644 --- a/src/LYCurses.c +++ b/src/LYCurses.c @@ -1,19 +1,19 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "LYCurses.h" -#include "LYStyle.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYMainLoop.h" -#include "LYSignal.h" -#include "LYClean.h" -#include "LYReadCFG.h" -#include "LYStrings.h" -#include "LYCharSets.h" -#include "UCAux.h" - -#include "LYexit.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYCurses.h> +#include <LYStyle.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYMainLoop.h> +#include <LYSignal.h> +#include <LYClean.h> +#include <LYReadCFG.h> +#include <LYStrings.h> +#include <LYCharSets.h> +#include <UCAux.h> + +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -34,8 +34,8 @@ extern int _NOSHARE(COLS); #endif /* VMS && __GNUC__ */ #ifdef USE_COLOR_STYLE -#include "AttrList.h" -#include "LYHash.h" +#include <AttrList.h> +#include <LYHash.h> #endif #if defined(COLOR_CURSES) @@ -1242,7 +1242,7 @@ PUBLIC void LYstopTargetEmphasis NOARGS #undef system #endif /* system */ #include <processes.h> -#include "LYVMSdef.h" +#include <LYVMSdef.h> #define EFN 0 /* Event flag */ diff --git a/src/LYCurses.h b/src/LYCurses.h index 41d04aea..9704e532 100644 --- a/src/LYCurses.h +++ b/src/LYCurses.h @@ -1,7 +1,7 @@ #ifndef LYCURSES_H #define LYCURSES_H -#include "userdefs.h" +#include <userdefs.h> /* * The simple color scheme maps the 8 combinations of bold/underline/reverse @@ -100,7 +100,7 @@ extern void LYsubwindow PARAMS((WINDOW * param)); #else # if defined(VMS) && defined(__GNUC__) -# include "LYGCurses.h" +# include <LYGCurses.h> # else # include <curses.h> /* everything else */ # endif /* VMS && __GNUC__ */ @@ -146,7 +146,7 @@ extern int LYlines; /* replaces LINES */ extern int LYcols; /* replaces COLS */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ extern void start_curses NOPARAMS; diff --git a/src/LYDownload.c b/src/LYDownload.c index bc047b87..6e37de62 100644 --- a/src/LYDownload.c +++ b/src/LYDownload.c @@ -1,26 +1,26 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "HTList.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYStrings.h" -#include "LYClean.h" -#include "LYGetFile.h" -#include "LYDownload.h" -#include "LYSystem.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <HTList.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYStrings.h> +#include <LYClean.h> +#include <LYGetFile.h> +#include <LYDownload.h> +#include <LYSystem.h> #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYDownload.h b/src/LYDownload.h index 21cd30dd..8ea5b9fa 100644 --- a/src/LYDownload.h +++ b/src/LYDownload.h @@ -3,7 +3,7 @@ #define LYDOWNLOAD_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern void LYDownload PARAMS((char *line)); diff --git a/src/LYEdit.c b/src/LYEdit.c index 2ab96cf4..ae8a6eda 100644 --- a/src/LYEdit.c +++ b/src/LYEdit.c @@ -1,24 +1,24 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYSignal.h" -#include "LYUtils.h" -#include "LYClean.h" -#include "LYGlobalDefs.h" -#include "LYEdit.h" -#include "LYStrings.h" -#include "LYSystem.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYSignal.h> +#include <LYUtils.h> +#include <LYClean.h> +#include <LYGlobalDefs.h> +#include <LYEdit.h> +#include <LYStrings.h> +#include <LYSystem.h> #ifdef VMS #include <unixio.h> -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYEditmap.c b/src/LYEditmap.c index 54c146ff..290a47d1 100644 --- a/src/LYEditmap.c +++ b/src/LYEditmap.c @@ -2,9 +2,9 @@ Keybindings for line and form editting. */ -#include "HTUtils.h" -#include "tcp.h" -#include "LYStrings.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYStrings.h> PUBLIC int current_lineedit = 0; /* Index into LYLineEditors[] */ diff --git a/src/LYExtern.c b/src/LYExtern.c index 9e793a04..5d4d9db8 100644 --- a/src/LYExtern.c +++ b/src/LYExtern.c @@ -15,13 +15,13 @@ See lynx.cfg for other info. */ -#include "tcp.h" -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYExtern.h" -#include "LYCurses.h" +#include <tcp.h> +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYExtern.h> +#include <LYCurses.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #ifdef USE_EXTERNALS #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYExtern.h b/src/LYExtern.h index 09983b47..094f4ddc 100644 --- a/src/LYExtern.h +++ b/src/LYExtern.h @@ -2,7 +2,7 @@ #define EXTERNALS_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ void run_external PARAMS((char * c)); diff --git a/src/LYForms.c b/src/LYForms.c index 0387ad1d..7a66897b 100644 --- a/src/LYForms.c +++ b/src/LYForms.c @@ -1,24 +1,24 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTCJK.h" -#include "HTTP.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "GridText.h" -#include "LYCharSets.h" -#include "UCAux.h" -#include "LYUtils.h" -#include "LYStructs.h" /* includes HTForms.h */ -#include "LYStrings.h" -#include "LYGlobalDefs.h" -#include "LYKeymap.h" -#include "LYSignal.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTCJK.h> +#include <HTTP.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <GridText.h> +#include <LYCharSets.h> +#include <UCAux.h> +#include <LYUtils.h> +#include <LYStructs.h> /* includes HTForms.h */ +#include <LYStrings.h> +#include <LYGlobalDefs.h> +#include <LYKeymap.h> +#include <LYSignal.h> + +#include <LYLeaks.h> #ifdef USE_COLOR_STYLE -#include "AttrList.h" -#include "LYHash.h" +#include <AttrList.h> +#include <LYHash.h> #endif extern HTCJKlang HTCJK; diff --git a/src/LYGetFile.c b/src/LYGetFile.c index 2bec52b3..037e4c99 100644 --- a/src/LYGetFile.c +++ b/src/LYGetFile.c @@ -1,42 +1,42 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTTP.h" -#include "HTAnchor.h" /* Anchor class */ -#include "HTAccess.h" -#include "HTParse.h" -#include "LYCurses.h" -#include "GridText.h" -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYCharSets.h" -#include "LYCharUtils.h" -#include "HTAlert.h" -#include "LYSignal.h" -#include "LYGetFile.h" -#include "LYPrint.h" -#include "LYHistory.h" -#include "LYStrings.h" -#include "LYClean.h" -#include "LYDownload.h" -#include "LYNews.h" -#include "LYMail.h" -#include "LYSystem.h" -#include "LYKeymap.h" -#include "LYBookmark.h" -#include "LYMap.h" -#include "LYList.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTTP.h> +#include <HTAnchor.h> /* Anchor class */ +#include <HTAccess.h> +#include <HTParse.h> +#include <LYCurses.h> +#include <GridText.h> +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYCharSets.h> +#include <LYCharUtils.h> +#include <HTAlert.h> +#include <LYSignal.h> +#include <LYGetFile.h> +#include <LYPrint.h> +#include <LYHistory.h> +#include <LYStrings.h> +#include <LYClean.h> +#include <LYDownload.h> +#include <LYNews.h> +#include <LYMail.h> +#include <LYSystem.h> +#include <LYKeymap.h> +#include <LYBookmark.h> +#include <LYMap.h> +#include <LYList.h> #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif #ifdef DIRED_SUPPORT -#include "LYLocal.h" +#include <LYLocal.h> #endif /* DIRED_SUPPORT */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #ifndef VMS #ifdef SYSLOG_REQUESTED_URLS diff --git a/src/LYGlobalDefs.h b/src/LYGlobalDefs.h index 80cba706..8d447861 100644 --- a/src/LYGlobalDefs.h +++ b/src/LYGlobalDefs.h @@ -4,15 +4,15 @@ #define LYGLOBALDEFS_H #ifndef USERDEFS_H -#include "userdefs.h" +#include <userdefs.h> #endif /* USERDEFS_H */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ #ifdef SOCKS @@ -112,6 +112,7 @@ extern int LYChosenShowColor; /* extended color/monochrome choice */ extern int LYrcShowColor; /* ... as read or last written */ extern BOOLEAN LYShowCursor; /* Show the cursor or hide it? */ +extern BOOLEAN verbose_img; /* display filenames of images? */ extern BOOLEAN LYUseDefShoCur; /* Command line -show_cursor toggle */ extern BOOLEAN LYCursesON; /* start_curses()->TRUE, stop_curses()->FALSE */ extern BOOLEAN LYUserSpecifiedURL; /* URL from a goto or document? */ diff --git a/src/LYHash.c b/src/LYHash.c index a6eea95f..e6439a3d 100644 --- a/src/LYHash.c +++ b/src/LYHash.c @@ -2,13 +2,13 @@ ** (c) 1996 Rob Partington */ -#include "LYStructs.h" -#include "LYCurses.h" -#include "AttrList.h" -#include "SGML.h" -#include "HTMLDTD.h" +#include <LYStructs.h> +#include <LYCurses.h> +#include <AttrList.h> +#include <SGML.h> +#include <HTMLDTD.h> -#include "LYHash.h" +#include <LYHash.h> #ifdef NOT_USED diff --git a/src/LYHistory.c b/src/LYHistory.c index bccb2ec8..433114b4 100644 --- a/src/LYHistory.c +++ b/src/LYHistory.c @@ -1,27 +1,27 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTTP.h" -#include "HTAlert.h" -#include "HText.h" -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYHistory.h" -#include "LYPrint.h" -#include "LYDownload.h" -#include "LYKeymap.h" -#include "LYList.h" -#include "LYShowInfo.h" -#include "LYSignal.h" -#include "LYStrings.h" -#include "LYCharUtils.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTTP.h> +#include <HTAlert.h> +#include <HText.h> +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYHistory.h> +#include <LYPrint.h> +#include <LYDownload.h> +#include <LYKeymap.h> +#include <LYList.h> +#include <LYShowInfo.h> +#include <LYSignal.h> +#include <LYStrings.h> +#include <LYCharUtils.h> #ifdef DIRED_SUPPORT -#include "LYUpload.h" -#include "LYLocal.h" +#include <LYUpload.h> +#include <LYLocal.h> #endif /* DIRED_SUPPORT */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYHistory.h b/src/LYHistory.h index caac9605..3e5bf72b 100644 --- a/src/LYHistory.h +++ b/src/LYHistory.h @@ -3,7 +3,7 @@ #define LYHISTORY_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern void LYAddVisitedLink PARAMS((document *doc)); diff --git a/src/LYJump.c b/src/LYJump.c index e0100099..3f7910eb 100644 --- a/src/LYJump.c +++ b/src/LYJump.c @@ -1,15 +1,15 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAlert.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYGlobalDefs.h" -#include "LYJump.h" -#include "LYKeymap.h" -#include "LYSignal.h" -#include "GridText.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAlert.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYGlobalDefs.h> +#include <LYJump.h> +#include <LYKeymap.h> +#include <LYSignal.h> +#include <GridText.h> + +#include <LYLeaks.h> #ifdef VMS #include <fab.h> diff --git a/src/LYKeymap.c b/src/LYKeymap.c index bd70042b..1ae0e763 100644 --- a/src/LYKeymap.c +++ b/src/LYKeymap.c @@ -1,13 +1,13 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "LYUtils.h" -#include "LYKeymap.h" -#include "LYGlobalDefs.h" -#include "HTAccess.h" -#include "HTFormat.h" -#include "HTAlert.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYUtils.h> +#include <LYKeymap.h> +#include <LYGlobalDefs.h> +#include <HTAccess.h> +#include <HTFormat.h> +#include <HTAlert.h> + +#include <LYLeaks.h> PRIVATE CONST DocAddress keymap_anchor = {"LYNXKEYMAP", NULL, NULL}; diff --git a/src/LYLeaks.c b/src/LYLeaks.c index 79ebf838..29845d30 100644 --- a/src/LYLeaks.c +++ b/src/LYLeaks.c @@ -9,11 +9,11 @@ */ #define NO_MEMORY_TRACKING -#include "HTUtils.h" -#include "tcp.h" -#include "LYexit.h" -#include "LYLeaks.h" -#include "LYUtils.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYexit.h> +#include <LYLeaks.h> +#include <LYUtils.h> #include <ctype.h> /*#include <stdio.h> included by HTUtils.h -- FM */ diff --git a/src/LYList.c b/src/LYList.c index b283ed3b..5622f4ba 100644 --- a/src/LYList.c +++ b/src/LYList.c @@ -5,22 +5,22 @@ ** */ -#include "HTUtils.h" -#include "tcp.h" -#include "LYUtils.h" -#include "GridText.h" -#include "LYList.h" -#include "LYSignal.h" -#include "LYGlobalDefs.h" -#include "LYCharUtils.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYUtils.h> +#include <GridText.h> +#include <LYList.h> +#include <LYSignal.h> +#include <LYGlobalDefs.h> +#include <LYCharUtils.h> #ifdef DIRED_SUPPORT -#include "LYUpload.h" -#include "LYLocal.h" +#include <LYUpload.h> +#include <LYLocal.h> #endif /* DIRED_SUPPORT */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYLocal.c b/src/LYLocal.c index 87139561..320ca0cd 100644 --- a/src/LYLocal.c +++ b/src/LYLocal.c @@ -28,21 +28,21 @@ ** Cast all code into the Lynx programming style. - FM */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAlert.h" -#include "HTParse.h" -#include "LYCurses.h" -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYCharUtils.h" -#include "LYStructs.h" -#include "LYGetFile.h" -#include "LYHistory.h" -#include "LYUpload.h" -#include "LYLocal.h" -#include "LYSystem.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAlert.h> +#include <HTParse.h> +#include <LYCurses.h> +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYCharUtils.h> +#include <LYStructs.h> +#include <LYGetFile.h> +#include <LYHistory.h> +#include <LYUpload.h> +#include <LYLocal.h> +#include <LYSystem.h> #ifndef VMS #ifndef _WINDOWS @@ -70,7 +70,7 @@ # endif #endif -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYMail.c b/src/LYMail.c index b7acce45..f3a69290 100644 --- a/src/LYMail.c +++ b/src/LYMail.c @@ -1,19 +1,19 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "LYGlobalDefs.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYSignal.h" -#include "LYUtils.h" -#include "LYClean.h" -#include "LYStrings.h" -#include "GridText.h" -#include "LYSystem.h" -#include "LYMail.h" -#include "LYCharSets.h" /* to get current charset for mail header */ - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <LYGlobalDefs.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYSignal.h> +#include <LYUtils.h> +#include <LYClean.h> +#include <LYStrings.h> +#include <GridText.h> +#include <LYSystem.h> +#include <LYMail.h> +#include <LYCharSets.h> /* to get current charset for mail header */ + +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYMail.h b/src/LYMail.h index 22ce9063..8de71866 100644 --- a/src/LYMail.h +++ b/src/LYMail.h @@ -3,7 +3,7 @@ #define LYMAIL_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern BOOLEAN term_letter; diff --git a/src/LYMain.c b/src/LYMain.c index 65fea071..f34be98d 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1,37 +1,37 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTTP.h" -#include "HTParse.h" -#include "HTAccess.h" -#include "HTList.h" -#include "HTFile.h" -#include "UCMap.h" -#include "UCDefs.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTTP.h> +#include <HTParse.h> +#include <HTAccess.h> +#include <HTList.h> +#include <HTFile.h> +#include <UCMap.h> +#include <UCDefs.h> #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ -#include "HTInit.h" -#include "LYCurses.h" -#include "LYStyle.h" -#include "HTML.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYGetFile.h" -#include "LYStrings.h" -#include "LYClean.h" -#include "LYCharSets.h" -#include "LYCharUtils.h" -#include "UCMap.h" -#include "LYReadCFG.h" -#include "LYrcFile.h" -#include "LYKeymap.h" -#include "LYList.h" -#include "LYJump.h" -#include "LYMainLoop.h" -#include "LYBookmark.h" +#include <HTInit.h> +#include <LYCurses.h> +#include <LYStyle.h> +#include <HTML.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYGetFile.h> +#include <LYStrings.h> +#include <LYClean.h> +#include <LYCharSets.h> +#include <LYCharUtils.h> +#include <UCMap.h> +#include <LYReadCFG.h> +#include <LYrcFile.h> +#include <LYKeymap.h> +#include <LYList.h> +#include <LYJump.h> +#include <LYMainLoop.h> +#include <LYBookmark.h> #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif #ifndef VMS @@ -41,11 +41,11 @@ #endif /* !VMS */ #ifdef LOCALE -#include<locale.h> +#include <locale.h> #endif /* LOCALE */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -164,6 +164,7 @@ PUBLIC int LYShowColor = SHOW_COLOR_UNKNOWN; /* to show or not to show */ PUBLIC int LYChosenShowColor = SHOW_COLOR_UNKNOWN; /* whether to show and save */ PUBLIC int LYrcShowColor = SHOW_COLOR_UNKNOWN; /* ... as last read or written */ PUBLIC BOOLEAN LYShowCursor = SHOW_CURSOR; /* to show or not to show */ +PUBLIC BOOLEAN verbose_img = VERBOSE_IMAGES; /* show filenames or not */ PUBLIC BOOLEAN LYUseDefShoCur = TRUE; /* Command line -show_cursor toggle */ PUBLIC BOOLEAN LYforce_no_cache = FALSE; PUBLIC BOOLEAN LYoverride_no_cache = FALSE;/*override no-cache b/c history etc*/ @@ -571,7 +572,7 @@ else {init_ctrl_break[0] = 1;} #endif #ifdef DOSPATH - terminal = "vt100"; + if (getenv("TERM")==NULL) putenv("TERM=vt100"); #endif LYShowColor = (SHOW_COLOR ? SHOW_COLOR_ON : SHOW_COLOR_OFF); diff --git a/src/LYMainLoop.c b/src/LYMainLoop.c index 07faecb7..fa1ba6a1 100644 --- a/src/LYMainLoop.c +++ b/src/LYMainLoop.c @@ -1,63 +1,63 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAccess.h" -#include "HTParse.h" -#include "HTList.h" -#include "HTML.h" -#include "HTFTP.h" -#include "HTFile.h" -#include "HTTP.h" -#include "HTAABrow.h" -#include "HTNews.h" -#include "LYCurses.h" -#include "LYStyle.h" -#include "LYGlobalDefs.h" -#include "HTAlert.h" -#include "LYUtils.h" -#include "GridText.h" -#include "LYStrings.h" -#include "LYOptions.h" -#include "LYSignal.h" -#include "LYGetFile.h" -#include "HTForms.h" -#include "LYSearch.h" -#include "LYClean.h" -#include "LYHistory.h" -#include "LYPrint.h" -#include "LYMail.h" -#include "LYEdit.h" -#include "LYShowInfo.h" -#include "LYBookmark.h" -#include "LYSystem.h" -#include "LYKeymap.h" -#include "LYJump.h" -#include "LYDownload.h" -#include "LYList.h" -#include "LYMap.h" -#include "LYTraversal.h" -#include "LYCharSets.h" -#include "LYCharUtils.h" -#include "LYCookie.h" -#include "LYMainLoop.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAccess.h> +#include <HTParse.h> +#include <HTList.h> +#include <HTML.h> +#include <HTFTP.h> +#include <HTFile.h> +#include <HTTP.h> +#include <HTAABrow.h> +#include <HTNews.h> +#include <LYCurses.h> +#include <LYStyle.h> +#include <LYGlobalDefs.h> +#include <HTAlert.h> +#include <LYUtils.h> +#include <GridText.h> +#include <LYStrings.h> +#include <LYOptions.h> +#include <LYSignal.h> +#include <LYGetFile.h> +#include <HTForms.h> +#include <LYSearch.h> +#include <LYClean.h> +#include <LYHistory.h> +#include <LYPrint.h> +#include <LYMail.h> +#include <LYEdit.h> +#include <LYShowInfo.h> +#include <LYBookmark.h> +#include <LYSystem.h> +#include <LYKeymap.h> +#include <LYJump.h> +#include <LYDownload.h> +#include <LYList.h> +#include <LYMap.h> +#include <LYTraversal.h> +#include <LYCharSets.h> +#include <LYCharUtils.h> +#include <LYCookie.h> +#include <LYMainLoop.h> #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif #ifdef USE_EXTERNALS -#include "LYExtern.h" +#include <LYExtern.h> #endif #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DIRED_SUPPORT -#include "LYLocal.h" -#include "LYUpload.h" +#include <LYLocal.h> +#include <LYUpload.h> #endif /* DIRED_SUPPORT */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> PRIVATE BOOL confirm_post_resub PARAMS(( CONST char* address, diff --git a/src/LYMap.c b/src/LYMap.c index 618bf368..1e1ba24d 100644 --- a/src/LYMap.c +++ b/src/LYMap.c @@ -5,29 +5,29 @@ ** */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTTP.h" -#include "HTAnchor.h" -#include "HTAccess.h" -#include "HTFormat.h" -#include "HTParse.h" -#include "HTAlert.h" -#include "LYUtils.h" -#include "LYMap.h" -#include "GridText.h" -#include "LYSignal.h" -#include "LYGlobalDefs.h" -#include "LYKeymap.h" -#include "LYCharUtils.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTTP.h> +#include <HTAnchor.h> +#include <HTAccess.h> +#include <HTFormat.h> +#include <HTParse.h> +#include <HTAlert.h> +#include <LYUtils.h> +#include <LYMap.h> +#include <GridText.h> +#include <LYSignal.h> +#include <LYGlobalDefs.h> +#include <LYKeymap.h> +#include <LYCharUtils.h> #ifdef DIRED_SUPPORT -#include "LYUpload.h" -#include "LYLocal.h" +#include <LYUpload.h> +#include <LYLocal.h> #endif -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x=NULL;} diff --git a/src/LYNews.c b/src/LYNews.c index 77824ebd..5574819c 100644 --- a/src/LYNews.c +++ b/src/LYNews.c @@ -1,25 +1,25 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "HTAccess.h" -#include "HTCJK.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYSignal.h" -#include "LYStructs.h" -#include "LYUtils.h" -#include "LYClean.h" -#include "LYStrings.h" -#include "LYGetFile.h" -#include "LYHistory.h" -#include "LYSystem.h" -#include "GridText.h" -#include "LYCharSets.h" -#include "LYNews.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <HTAccess.h> +#include <HTCJK.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYSignal.h> +#include <LYStructs.h> +#include <LYUtils.h> +#include <LYClean.h> +#include <LYStrings.h> +#include <LYGetFile.h> +#include <LYHistory.h> +#include <LYSystem.h> +#include <GridText.h> +#include <LYCharSets.h> +#include <LYNews.h> -#include "LYGlobalDefs.h" +#include <LYGlobalDefs.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYNews.h b/src/LYNews.h index 17d9d48a..9eaa8e13 100644 --- a/src/LYNews.h +++ b/src/LYNews.h @@ -2,7 +2,7 @@ #define LYNEWSPOST_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern BOOLEAN term_message; diff --git a/src/LYOptions.c b/src/LYOptions.c index c63740a4..0bd7bb0f 100644 --- a/src/LYOptions.c +++ b/src/LYOptions.c @@ -1,25 +1,25 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTFTP.h" -#include "HTML.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYGlobalDefs.h" -#include "LYOptions.h" -#include "LYSignal.h" -#include "LYClean.h" -#include "LYCharSets.h" -#include "LYCharUtils.h" -#include "UCMap.h" -#include "UCAux.h" -#include "LYKeymap.h" -#include "LYrcFile.h" -#include "HTAlert.h" -#include "LYBookmark.h" -#include "GridText.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTFTP.h> +#include <HTML.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYGlobalDefs.h> +#include <LYOptions.h> +#include <LYSignal.h> +#include <LYClean.h> +#include <LYCharSets.h> +#include <LYCharUtils.h> +#include <UCMap.h> +#include <UCAux.h> +#include <LYKeymap.h> +#include <LYrcFile.h> +#include <HTAlert.h> +#include <LYBookmark.h> +#include <GridText.h> + +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYPrint.c b/src/LYPrint.c index 04051990..2ad75810 100644 --- a/src/LYPrint.c +++ b/src/LYPrint.c @@ -1,30 +1,30 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAccess.h" -#include "HTList.h" -#include "HTAlert.h" -#include "HTFile.h" -#include "LYCurses.h" -#include "GridText.h" -#include "LYUtils.h" -#include "LYPrint.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYStrings.h" -#include "LYClean.h" -#include "LYGetFile.h" -#include "LYHistory.h" -#include "LYSystem.h" -#include "LYList.h" -#include "LYCharSets.h" /* To get current charset for mail header. */ +#include <HTUtils.h> +#include <tcp.h> +#include <HTAccess.h> +#include <HTList.h> +#include <HTAlert.h> +#include <HTFile.h> +#include <LYCurses.h> +#include <GridText.h> +#include <LYUtils.h> +#include <LYPrint.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYStrings.h> +#include <LYClean.h> +#include <LYGetFile.h> +#include <LYHistory.h> +#include <LYSystem.h> +#include <LYList.h> +#include <LYCharSets.h> /* To get current charset for mail header. */ #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYPrint.h b/src/LYPrint.h index b4cfdf1a..fec8200f 100644 --- a/src/LYPrint.h +++ b/src/LYPrint.h @@ -3,7 +3,7 @@ #define LYPRINT_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern int printfile PARAMS((document *newdoc)); diff --git a/src/LYReadCFG.c b/src/LYReadCFG.c index 4a57dcdc..228d5029 100644 --- a/src/LYReadCFG.c +++ b/src/LYReadCFG.c @@ -1,28 +1,28 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTFile.h" -#include "UCMap.h" - -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYStructs.h" -#include "LYGlobalDefs.h" -#include "LYCharSets.h" -#include "LYKeymap.h" -#include "LYJump.h" -#include "LYGetFile.h" -#include "LYCgi.h" -#include "LYCurses.h" -#include "LYSignal.h" -#include "LYBookmark.h" -#include "LYReadCFG.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTFile.h> +#include <UCMap.h> + +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYStructs.h> +#include <LYGlobalDefs.h> +#include <LYCharSets.h> +#include <LYKeymap.h> +#include <LYJump.h> +#include <LYGetFile.h> +#include <LYCgi.h> +#include <LYCurses.h> +#include <LYSignal.h> +#include <LYBookmark.h> +#include <LYReadCFG.h> #ifdef DIRED_SUPPORT -#include "LYLocal.h" +#include <LYLocal.h> #endif /* DIRED_SUPPORT */ -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -1240,7 +1240,10 @@ PUBLIC void read_cfg ARGS3( break; case 'V': - if (!strncasecomp(buffer, "VI_KEYS_ALWAYS_ON:", 18)) { + if (!strncasecomp(buffer, "VERBOSE_IMAGES:", 15)) { + verbose_img = is_true(buffer+15); + + } else if (!strncasecomp(buffer, "VI_KEYS_ALWAYS_ON:", 18)) { vi_keys = is_true(buffer+18); } else if (!strncasecomp(buffer, "VIEWER:", 7)) { diff --git a/src/LYReadCFG.h b/src/LYReadCFG.h index 63050ee1..a6ed7c70 100644 --- a/src/LYReadCFG.h +++ b/src/LYReadCFG.h @@ -2,7 +2,7 @@ #define LYREADCFG_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ #if defined(USE_COLOR_STYLE) || defined(USE_COLOR_TABLE) diff --git a/src/LYSearch.c b/src/LYSearch.c index d03fc08d..aed16225 100644 --- a/src/LYSearch.c +++ b/src/LYSearch.c @@ -1,13 +1,13 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYSearch.h" -#include "LYGlobalDefs.h" -#include "GridText.h" -#include "LYSignal.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYSearch.h> +#include <LYGlobalDefs.h> +#include <GridText.h> +#include <LYSignal.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYSearch.h b/src/LYSearch.h index cff7b806..a8a31973 100644 --- a/src/LYSearch.h +++ b/src/LYSearch.h @@ -3,7 +3,7 @@ #define LYSEARCH_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCT_H */ extern BOOL textsearch PARAMS((document *cur_doc, diff --git a/src/LYShowInfo.c b/src/LYShowInfo.c index dfb2f211..65f06958 100644 --- a/src/LYShowInfo.c +++ b/src/LYShowInfo.c @@ -1,25 +1,25 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "HTAlert.h" -#include "HTTP.h" -#include "LYCurses.h" -#include "LYStrings.h" -#include "LYUtils.h" -#include "LYStructs.h" -#include "LYGlobalDefs.h" -#include "LYShowInfo.h" -#include "LYSignal.h" -#include "LYCharUtils.h" -#include "GridText.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <HTAlert.h> +#include <HTTP.h> +#include <LYCurses.h> +#include <LYStrings.h> +#include <LYUtils.h> +#include <LYStructs.h> +#include <LYGlobalDefs.h> +#include <LYShowInfo.h> +#include <LYSignal.h> +#include <LYCharUtils.h> +#include <GridText.h> + +#include <LYLeaks.h> #ifdef DIRED_SUPPORT #include <pwd.h> #include <grp.h> #include <time.h> -#include "LYLocal.h" +#include <LYLocal.h> #endif /* DIRED_SUPPORT */ #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYShowInfo.h b/src/LYShowInfo.h index 78b33064..3333cb4b 100644 --- a/src/LYShowInfo.h +++ b/src/LYShowInfo.h @@ -3,7 +3,7 @@ #define LYSHOWINFO_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern int showinfo PARAMS((document *doc, int size_of_file, document *newdoc, diff --git a/src/LYStrings.c b/src/LYStrings.c index b9cfd7bd..f273f051 100644 --- a/src/LYStrings.c +++ b/src/LYStrings.c @@ -1,23 +1,23 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTCJK.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYGlobalDefs.h" -#include "GridText.h" -#include "LYKeymap.h" -#include "LYSignal.h" -#include "LYClean.h" -#include "LYMail.h" -#include "LYNews.h" -#include "LYOptions.h" -#include "LYCharSets.h" -#include "HTString.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTCJK.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYGlobalDefs.h> +#include <GridText.h> +#include <LYKeymap.h> +#include <LYSignal.h> +#include <LYClean.h> +#include <LYMail.h> +#include <LYNews.h> +#include <LYOptions.h> +#include <LYCharSets.h> +#include <HTString.h> #include <ctype.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYStructs.h b/src/LYStructs.h index 1c224479..051db432 100644 --- a/src/LYStructs.h +++ b/src/LYStructs.h @@ -3,11 +3,11 @@ #define LYSTRUCTS_H #ifndef USERDEFS_H -#include "userdefs.h" +#include <userdefs.h> #endif /* USERDEFS_H */ #ifndef HTANCHOR_H -#include "HTAnchor.h" +#include <HTAnchor.h> #endif /* HTANCHOR_H */ typedef struct link { @@ -45,7 +45,7 @@ typedef struct _document { } document; #ifndef HTFORMS_H -#include "HTForms.h" +#include <HTForms.h> #endif /* HTFORMS_H */ typedef struct _histstruct { diff --git a/src/LYStyle.c b/src/LYStyle.c index 4c562208..3953621f 100644 --- a/src/LYStyle.c +++ b/src/LYStyle.c @@ -1,27 +1,27 @@ /* character level styles for Lynx * (c) 1996 Rob Partington -- donated to the Lyncei (if they want it :-) - * @Id: LYStyle.c 1.16 Fri, 27 Feb 1998 11:25:07 -0700 dickey @ + * @Id: LYStyle.c 1.17 Wed, 25 Mar 1998 06:58:54 -0700 dickey @ */ -#include "HTUtils.h" -#include "HTML.h" -#include "tcp.h" -#include "LYSignal.h" -#include "LYGlobalDefs.h" - -#include "LYStructs.h" -#include "LYReadCFG.h" -#include "LYCurses.h" -#include "LYCharUtils.h" -#include "AttrList.h" -#include "SGML.h" -#include "HTMLDTD.h" +#include <HTUtils.h> +#include <HTML.h> +#include <tcp.h> +#include <LYSignal.h> +#include <LYGlobalDefs.h> + +#include <LYStructs.h> +#include <LYReadCFG.h> +#include <LYCurses.h> +#include <LYCharUtils.h> +#include <AttrList.h> +#include <SGML.h> +#include <HTMLDTD.h> /* Hash table definitions */ -#include "LYHash.h" -#include "LYStyle.h" +#include <LYHash.h> +#include <LYStyle.h> -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #ifdef USE_COLOR_STYLE @@ -77,13 +77,17 @@ PRIVATE void parse_attributes ARGS5(char*,mono,char*,fg,char*,bg,int,style,char* bA = check_color(bg, default_bg); if (fA == NO_COLOR) { bA = NO_COLOR; - } else { + } else if (COLORS) { if (fA >= COLORS || bA >= COLORS) cA = A_BOLD; if (fA >= COLORS) fA %= COLORS; if (bA > COLORS) bA %= COLORS; + } else { + cA = A_BOLD; + fA = NO_COLOR; + bA = NO_COLOR; } /* @@ -145,8 +149,8 @@ where OBJECT is one of EM,STRONG,B,I,U,BLINK etc.\n\n", buffer); } { char *i; - for (i = buffer; *i; *i++ = tolower(*i)) - ; + for (i = buffer; *i; i++) + *i = tolower(*i); } *tmp = '\0'; element = buffer; diff --git a/src/LYStyle.h b/src/LYStyle.h index 8ec3c52c..6d2689a7 100644 --- a/src/LYStyle.h +++ b/src/LYStyle.h @@ -3,7 +3,7 @@ #ifdef USE_COLOR_STYLE -#include "AttrList.h" +#include <AttrList.h> /* list of elements */ extern CONST SGML_dtd HTML_dtd; diff --git a/src/LYTraversal.c b/src/LYTraversal.c index 44853908..c8e0df47 100644 --- a/src/LYTraversal.c +++ b/src/LYTraversal.c @@ -1,12 +1,12 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYSignal.h" -#include "LYTraversal.h" - -#include "LYexit.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYSignal.h> +#include <LYTraversal.h> + +#include <LYexit.h> +#include <LYLeaks.h> /* routines to handle special traversal feature */ diff --git a/src/LYTraversal.h b/src/LYTraversal.h index 1d97ce5f..e6cb01bb 100644 --- a/src/LYTraversal.h +++ b/src/LYTraversal.h @@ -3,7 +3,7 @@ #ifndef TRAVERSAL_H #define TRAVERSAL_H -#include "HTUtils.h" /* BOOL, PARAMS, ARGS */ +#include <HTUtils.h> /* BOOL, PARAMS, ARGS */ extern BOOLEAN lookup PARAMS((char * target)); extern void add_to_table PARAMS((char * target)); diff --git a/src/LYUpload.c b/src/LYUpload.c index dba75c56..0ad784f5 100644 --- a/src/LYUpload.c +++ b/src/LYUpload.c @@ -14,23 +14,23 @@ ** the command line (great way of bypassing the nodotfile code :=( ). */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "LYStrings.h" -#include "LYClean.h" -#include "LYGetFile.h" -#include "LYUpload.h" -#include "LYSystem.h" -#include "LYLocal.h" - -#include "LYexit.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <LYStrings.h> +#include <LYClean.h> +#include <LYGetFile.h> +#include <LYUpload.h> +#include <LYSystem.h> +#include <LYLocal.h> + +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/LYUpload.h b/src/LYUpload.h index 9f74edf6..17542b06 100644 --- a/src/LYUpload.h +++ b/src/LYUpload.h @@ -3,7 +3,7 @@ #define LYUPLOAD_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern int LYUpload PARAMS((char *line)); diff --git a/src/LYUtils.c b/src/LYUtils.c index 48d76486..842b8f0c 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -1,26 +1,26 @@ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> #include <ctype.h> -#include "HTParse.h" -#include "HTAccess.h" -#include "HTCJK.h" -#include "HTAlert.h" -#include "LYCurses.h" -#include "LYUtils.h" -#include "LYStrings.h" -#include "LYGlobalDefs.h" -#include "LYSignal.h" -#include "GridText.h" -#include "LYCharSets.h" +#include <HTParse.h> +#include <HTAccess.h> +#include <HTCJK.h> +#include <HTAlert.h> +#include <LYCurses.h> +#include <LYUtils.h> +#include <LYStrings.h> +#include <LYGlobalDefs.h> +#include <LYSignal.h> +#include <GridText.h> +#include <LYCharSets.h> #ifdef DOSPATH -#include "HTDOS.h" +#include <HTDOS.h> #endif #ifdef VMS #include <descrip.h> #include <libclidef.h> #include <lib$routines.h> -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ #if HAVE_UTMP @@ -45,12 +45,12 @@ #include <sys/ptem.h> #endif -#include "LYLeaks.h" +#include <LYLeaks.h> #ifdef USE_COLOR_STYLE -#include "AttrList.h" -#include "LYHash.h" -#include "LYStyle.h" +#include <AttrList.h> +#include <LYHash.h> +#include <LYStyle.h> #endif #undef hline /* FIXME: this is a curses feature used as a variable here */ @@ -4236,7 +4236,8 @@ have_VMS_URL: StrAllocCopy(*AllocatedString, old_string); } } else { - StrAllocCat(*AllocatedString, temp); + /* RW 1998Mar16 Restore AllocatedString to 'old_string' */ + StrAllocCopy(*AllocatedString, old_string); } if (TRACE) { fprintf(stderr, "Trying: '%s'\n", *AllocatedString); diff --git a/src/LYUtils.h b/src/LYUtils.h index cfccb4be..29ab92c4 100644 --- a/src/LYUtils.h +++ b/src/LYUtils.h @@ -5,7 +5,7 @@ #include <stdio.h> #ifndef HTLIST_H -#include "HTList.h" +#include <HTList.h> #endif /* HTLIST_H */ extern void highlight PARAMS((int flag, int cur, char *target)); diff --git a/src/LYexit.c b/src/LYexit.c index c884bf58..1e2fb11c 100644 --- a/src/LYexit.c +++ b/src/LYexit.c @@ -1,14 +1,14 @@ /* * Copyright (c) 1994, University of Kansas, All Rights Reserved */ -#include "HTUtils.h" -#include "tcp.h" -#include "LYexit.h" +#include <HTUtils.h> +#include <tcp.h> +#include <LYexit.h> #ifndef VMS -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYSignal.h" -#include "LYClean.h" +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYSignal.h> +#include <LYClean.h> #ifdef SYSLOG_REQUESTED_URLS #include <syslog.h> #endif /* SYSLOG_REQUESTED_URLS */ diff --git a/src/LYrcFile.c b/src/LYrcFile.c index 92ec977e..64aadeff 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -1,14 +1,14 @@ -#include "HTUtils.h" -#include "tcp.h" -#include "HTFTP.h" -#include "LYUtils.h" -#include "LYrcFile.h" -#include "LYStrings.h" -#include "LYGlobalDefs.h" -#include "LYCharSets.h" -#include "LYBookmark.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTFTP.h> +#include <LYUtils.h> +#include <LYrcFile.h> +#include <LYStrings.h> +#include <LYGlobalDefs.h> +#include <LYCharSets.h> +#include <LYBookmark.h> + +#include <LYLeaks.h> PUBLIC void read_rc NOPARAMS { diff --git a/src/LYrcFile.h b/src/LYrcFile.h index fedc927a..05bbc0db 100644 --- a/src/LYrcFile.h +++ b/src/LYrcFile.h @@ -3,7 +3,7 @@ #define LYRCFILE_H #ifndef LYSTRUCTS_H -#include "LYStructs.h" +#include <LYStructs.h> #endif /* LYSTRUCTS_H */ extern void read_rc NOPARAMS; diff --git a/src/UCAuto.c b/src/UCAuto.c index e0c95f4d..e5f11af9 100644 --- a/src/UCAuto.c +++ b/src/UCAuto.c @@ -14,15 +14,15 @@ ** Any ideas how to do this for other systems? */ -#include "HTUtils.h" -#include "tcp.h" - -#include "UCMap.h" -#include "UCDefs.h" -#include "UCAuto.h" -#include "LYGlobalDefs.h" -#include "LYClean.h" -#include "LYUtils.h" +#include <HTUtils.h> +#include <tcp.h> + +#include <UCMap.h> +#include <UCDefs.h> +#include <UCAuto.h> +#include <LYGlobalDefs.h> +#include <LYClean.h> +#include <LYUtils.h> #ifdef EXP_CHARTRANS_AUTOSWITCH diff --git a/src/UCAux.c b/src/UCAux.c index 13685036..3a8bc56d 100644 --- a/src/UCAux.c +++ b/src/UCAux.c @@ -1,10 +1,10 @@ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "HTCJK.h" -#include "UCDefs.h" -#include "HTStream.h" -#include "UCAux.h" +#include <HTCJK.h> +#include <UCDefs.h> +#include <HTStream.h> +#include <UCAux.h> extern HTCJKlang HTCJK; extern LYUCcharset LYCharSet_UC[]; diff --git a/src/UCdomap.c b/src/UCdomap.c index c5b3cd83..20d78e92 100644 --- a/src/UCdomap.c +++ b/src/UCdomap.c @@ -14,57 +14,57 @@ * * aeb, 950210 */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTMLDTD.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTMLDTD.h> -#include "LYGlobalDefs.h" -#include "UCkd.h" -#include "UCdomap.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "LYCharSets.h" +#include <LYGlobalDefs.h> +#include <UCkd.h> +#include <UCdomap.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <LYCharSets.h> /* * Include tables & parameters. */ -#include "cp1250_uni.h" /* WinLatin2 (cp1250) */ -#include "cp1251_uni.h" /* WinCyrillic (cp1251) */ -#include "cp1252_uni.h" /* WinLatin1 (cp1252) */ -#include "cp1253_uni.h" /* WinGreek (cp1253) */ -#include "cp1255_uni.h" /* WinHebrew (cp1255) */ -#include "cp1256_uni.h" /* WinArabic (cp1256) */ -#include "cp1257_uni.h" /* WinBaltRim (cp1257) */ -#include "cp437_uni.h" /* DosLatinUS (cp437) */ -#include "cp737_uni.h" /* DosGreek (cp737) */ -#include "cp775_uni.h" /* DosBaltRim (cp775) */ -#include "cp850_uni.h" /* DosLatin1 (cp850) */ -#include "cp852_uni.h" /* DosLatin2 (cp852) */ -#include "cp862_uni.h" /* DosHebrew (cp862) */ -#include "cp864_uni.h" /* DosArabic (cp864) */ -#include "cp866_uni.h" /* DosCyrillic (cp866) */ -#include "cp869_uni.h" /* DosGreek2 (cp869) */ -#include "def7_uni.h" /* 7 bit approximations */ -#include "dmcs_uni.h" /* DEC Multinational */ -#include "iso01_uni.h" /* ISO Latin 1 */ -#include "iso02_uni.h" /* ISO Latin 2 */ -#include "iso03_uni.h" /* ISO Latin 3 */ -#include "iso04_uni.h" /* ISO Latin 4 */ -#include "iso05_uni.h" /* ISO 8859-5 Cyrillic */ -#include "iso06_uni.h" /* ISO 8859-6 Arabic */ -#include "iso07_uni.h" /* ISO 8859-7 Greek */ -#include "iso08_uni.h" /* ISO 8859-8 Hebrew */ -#include "iso09_uni.h" /* ISO 8859-9 (Latin 5) */ -#include "iso10_uni.h" /* ISO 8859-10 */ -#include "koi8r_uni.h" /* KOI8-R Cyrillic */ -#include "mac_uni.h" /* Macintosh (8 bit) */ -#include "mnem2_suni.h" /* RFC 1345 Mnemonic */ -#include "next_uni.h" /* NeXT character set */ -#include "rfc_suni.h" /* RFC 1345 w/o Intro */ -#include "utf8_uni.h" /* UNICODE UTF 8 */ -#include "viscii_uni.h" /* Vietnamese (VISCII) */ +#include <cp1250_uni.h> /* WinLatin2 (cp1250) */ +#include <cp1251_uni.h> /* WinCyrillic (cp1251) */ +#include <cp1252_uni.h> /* WinLatin1 (cp1252) */ +#include <cp1253_uni.h> /* WinGreek (cp1253) */ +#include <cp1255_uni.h> /* WinHebrew (cp1255) */ +#include <cp1256_uni.h> /* WinArabic (cp1256) */ +#include <cp1257_uni.h> /* WinBaltRim (cp1257) */ +#include <cp437_uni.h> /* DosLatinUS (cp437) */ +#include <cp737_uni.h> /* DosGreek (cp737) */ +#include <cp775_uni.h> /* DosBaltRim (cp775) */ +#include <cp850_uni.h> /* DosLatin1 (cp850) */ +#include <cp852_uni.h> /* DosLatin2 (cp852) */ +#include <cp862_uni.h> /* DosHebrew (cp862) */ +#include <cp864_uni.h> /* DosArabic (cp864) */ +#include <cp866_uni.h> /* DosCyrillic (cp866) */ +#include <cp869_uni.h> /* DosGreek2 (cp869) */ +#include <def7_uni.h> /* 7 bit approximations */ +#include <dmcs_uni.h> /* DEC Multinational */ +#include <iso01_uni.h> /* ISO Latin 1 */ +#include <iso02_uni.h> /* ISO Latin 2 */ +#include <iso03_uni.h> /* ISO Latin 3 */ +#include <iso04_uni.h> /* ISO Latin 4 */ +#include <iso05_uni.h> /* ISO 8859-5 Cyrillic */ +#include <iso06_uni.h> /* ISO 8859-6 Arabic */ +#include <iso07_uni.h> /* ISO 8859-7 Greek */ +#include <iso08_uni.h> /* ISO 8859-8 Hebrew */ +#include <iso09_uni.h> /* ISO 8859-9 (Latin 5) */ +#include <iso10_uni.h> /* ISO 8859-10 */ +#include <koi8r_uni.h> /* KOI8-R Cyrillic */ +#include <mac_uni.h> /* Macintosh (8 bit) */ +#include <mnem2_suni.h> /* RFC 1345 Mnemonic */ +#include <next_uni.h> /* NeXT character set */ +#include <rfc_suni.h> /* RFC 1345 w/o Intro */ +#include <utf8_uni.h> /* UNICODE UTF 8 */ +#include <viscii_uni.h> /* Vietnamese (VISCII) */ #ifdef NOTDEFINED -#include "mnem_suni.h" +#include <mnem_suni.h> #endif /* NOTDEFINED */ #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/src/chrtrans/build-chrtrans.com b/src/chrtrans/build-chrtrans.com index b1dd4a71..1694df14 100644 --- a/src/chrtrans/build-chrtrans.com +++ b/src/chrtrans/build-chrtrans.com @@ -36,7 +36,7 @@ $ CHRcompiler := "DECC" $ v1 = f$verify(1) $! DECC: $ cc := cc/decc/prefix=all /nomember 'CHRcc_opts'- - /INCLUDE=([-],[--],[--.WWW.Library.Implementation]) + /INCLUDE=([],[-],[--],[--.WWW.Library.Implementation]) $ v1 = 'f$verify(0)' $ ELSE $ IF f$search("gnu_cc:[000000]gcclib.olb") .nes. "" @@ -44,13 +44,13 @@ $ THEN $ CHRcompiler := "GNUC" $ v1 = f$verify(1) $! GNUC: -$ cc := gcc 'CHRcc_opts'/INCLUDE=([-],[--],[--.WWW.Library.Implementation]) +$ cc := gcc 'CHRcc_opts'/INCLUDE=([],[-],[--],[--.WWW.Library.Implementation]) $ v1 = 'f$verify(0)' $ ELSE $ CHRcompiler := "VAXC" $ v1 = f$verify(1) $! VAXC: -$ cc := cc 'CHRcc_opts'/INCLUDE=([-],[--],[--.WWW.Library.Implementation]) +$ cc := cc 'CHRcc_opts'/INCLUDE=([],[-],[--],[--.WWW.Library.Implementation]) $ v1 = 'f$verify(0)' $ ENDIF $ ENDIF diff --git a/src/chrtrans/makefile.dos b/src/chrtrans/makefile.dos index 6871b87a..60c7d56b 100644 --- a/src/chrtrans/makefile.dos +++ b/src/chrtrans/makefile.dos @@ -13,7 +13,9 @@ CFLAGS = $(MCFLAGS) CC = gcc MCFLAGS = -O3 -DDOSPATH -DNO_TTYTYP \ --I../../WWW/library/implement -I../../djgpp/tcplib/include \ +-I. \ +-I../../WWW/library/implement \ +-I../../djgpp/tcplib/include \ -I../../djgpp/tcplib/include/tcp .SUFFIXES: .tbl diff --git a/src/chrtrans/makefile.in b/src/chrtrans/makefile.in index c778a324..7cb02699 100644 --- a/src/chrtrans/makefile.in +++ b/src/chrtrans/makefile.in @@ -23,6 +23,7 @@ CFLAGS = @CFLAGS@ CPP_OPTS = @DEFS@ @CPPFLAGS@ \ -I../.. \ -I$(top_srcdir)/src \ + -I$(top_srcdir)/src/chrtrans \ -I$(top_srcdir)/$(WWWINC) \ $(SITE_DEFS) CC_OPTS = $(CPP_OPTS) $(CFLAGS) diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c index f1417cb7..874d971f 100644 --- a/src/chrtrans/makeuctb.c +++ b/src/chrtrans/makeuctb.c @@ -23,8 +23,8 @@ #include <string.h> #include <ctype.h> #else -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> /* * Don't try to use LYexit(). */ @@ -37,8 +37,8 @@ #define TOLOWER(c) (isupper((unsigned char)c) ? tolower((unsigned char)c) : (c)) #endif /* !TOLOWER */ -#include "UCkd.h" -#include "UCDefs.h" +#include <UCkd.h> +#include <UCDefs.h> #define MAX_FONTLEN 256 diff --git a/src/makefile.in b/src/makefile.in index 749c7a0a..18016728 100644 --- a/src/makefile.in +++ b/src/makefile.in @@ -162,7 +162,7 @@ UCdomap.o: UCdomap.c chrtrans/UCkd.h chrtrans/makeuctb chrtrans/makeuctb.c \ UCAux.o : UCAux.c $(CMN)UCAux.h $(CMN)UCDefs.h LYCookie.o: ../userdefs.h -depend : +depend : $(TABLES) makedepend -fmakefile -- $(CC_OPTS) -- $(C_SRC) # DO NOT DELETE THIS LINE -- make depend depends on it. |