diff options
187 files changed, 2272 insertions, 2413 deletions
diff --git a/CHANGES b/CHANGES index ad5fca27..e69feab6 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,35 @@ Changes since Lynx 2.8 release ================================================================================ -1998-03-20 +1998-03-29 (2.8.1dev.5) +* Fixed my typo for FNAMES_8_3 define. WB +* Added SYSTEM_MAIL and SYSTEM_MAIL_FLAGS defines for DOSPATH target. WB +* Better kluge to set terminal type for DOSPATH. WB +* Restored DOSPATH kludge to get to root of directory. WB +* Added a bit of missing _WINDOWS_NSL ifdef'ing. WB +* Minor DOS dirent mod to work with Tom's rearrangements. WB +* Changed #if XYZ to #ifdef XYZ in tcp.h for dumb (?) compilers. WB +1998-03-25 (2.8.1dev.4) +* restore original string in LYUtils.c when user enters a badly formed or + nonexistent URL when prompted for Goto/history list (patch by Randall + <hezekiah@may98.rahul.net>). Otherwise Lynx would always attempt to load + a local file. +* tweak formatting of .message in HTFTP.c so it has leading/trailing blank + lines (patch by Ismael Cordeiro <ismael@CAM.ORG>) +* retested 'make depend' rule (for Larry Virden) - TD +* eliminate (except for absolute pathnames, as in VMS) quoted includes - TD +* remove WWW/Library/Implementation/HTAlert.[ch], since they conflict with + src/HTAlert.[ch], and are not used - TD +* replace the [LINK], [INLINE] and [IMAGE] comments (for images without ALT) + with filenames of these images. This feature can be enabled or disabled by + setting VERBOSE_IMAGES in lynx.cfg and/or userdefs.h (patches by + helen@voland.cc.huji.ac.il and wschiavo@concentric.net>) +* consistently use ${cf_cv_ncurses_header-curses.h} rather than + $cf_cv_ncurses_header in configure script, as noted by JS - TD +* tweak include of HTML.h in HTFile.h to fix compile problem on VMS (we really + should not use quote-style includes) - TD +* fixes to LYStyle.c to make color-style code work on Digital Unix 4.0 - TD +1998-03-20 (2.8.1dev.3) * Added death for Win/DOS clients that don't have a TMP space defined. - WB * Added _WINDOWS_NSL to provide interruptable lookups in Win32 per a patch from afn06760@afn.org. (modified hopefully for borland AND cygwin and diff --git a/WWW/Library/Implementation/CommonMakefile b/WWW/Library/Implementation/CommonMakefile index b7d32576..c7fe8899 100644 --- a/WWW/Library/Implementation/CommonMakefile +++ b/WWW/Library/Implementation/CommonMakefile @@ -56,7 +56,8 @@ LOB = $(WTMP)/Library/$(WWW_MACH) # Only needed if HTWAIS.c is to be compiled. Put into your Makefile.include # uncomment these and fill in WAISINC for adding direct wais access # to Lynx. -#HTWAIS = $(LOB)/HTWAIS.o +#HTWAIS_c = $(CMN)/HTWAIS.c +#HTWAIS_o = $(LOB)/HTWAIS.o #WAIS = YES #WAISINC = -I../../../../freeWAIS-0.202/ir #WAISCFLAGS = -DDIRECT_WAIS @@ -78,7 +79,7 @@ COMMON = $(LOB)/HTParse.o $(LOB)/HTAccess.o $(LOB)/HTTP.o \ $(LOB)/HTList.o $(LOB)/HTString.o \ $(LOB)/HTRules.o $(LOB)/HTFormat.o $(LOB)/HTMIME.o \ $(LOB)/HTHistory.o $(LOB)/HTNews.o $(LOB)/HTGopher.o \ - $(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS) \ + $(LOB)/HTTelnet.o $(LOB)/HTFinger.o $(LOB)/HTWSRC.o $(HTWAIS_o) \ $(LOB)/HTAAUtil.o $(LOB)/HTAAServ.o $(LOB)/HTAABrow.o \ $(LOB)/HTAAFile.o $(LOB)/HTPasswd.o $(LOB)/HTGroup.o \ $(LOB)/HTACL.o $(LOB)/HTAuth.o $(LOB)/HTAAProt.o \ @@ -94,7 +95,7 @@ CFILES = $(CMN)HTParse.c $(CMN)HTAccess.c $(CMN)HTTP.c $(CMN)HTFile.c \ $(CMN)HTList.c $(CMN)HTString.c $(CMN)HTRules.c \ $(CMN)HTFormat.c $(CMN)HTMIME.c $(CMN)HTHistory.c \ $(CMN)HTNews.c $(CMN)HTGopher.c $(CMN)HTTelnet.c \ - $(CMN)HTFinger.c $(CMN)HTWAIS.c $(CMN)HTWSRC.c \ + $(CMN)HTFinger.c $(HTWAIS_c) $(CMN)HTWSRC.c \ $(CMN)HTAAUtil.c $(CMN)HTAAServ.c $(CMN)HTAABrow.c \ $(CMN)HTAAFile.c $(CMN)HTPasswd.c $(CMN)HTGroup.c \ $(CMN)HTACL.c $(CMN)HTAuth.c $(CMN)HTAAProt.c \ @@ -108,7 +109,7 @@ HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.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)HTString.h $(CMN)HTRules.h \ $(CMN)HTFormat.h $(CMN)HTInit.h \ $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ $(CMN)HTGopher.h \ @@ -327,7 +328,7 @@ $(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \ $(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \ $(CMN)HTAAUtil.h $(CMN)HTUU.h \ $(CMN)HTUtils.h $(CMN)HTString.h \ - $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \ + $(CMN)HTParse.h $(CMN)HTList.h \ $(CMN)HTAssoc.h $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c index 0ebe5309..4082d96a 100644 --- a/WWW/Library/Implementation/HTAABrow.c +++ b/WWW/Library/Implementation/HTAABrow.c @@ -50,18 +50,18 @@ ** */ -#include "HTUtils.h" +#include <HTUtils.h> #include <string.h> /* strchr() */ -#include "HTString.h" -#include "HTParse.h" /* URL parsing function */ -#include "HTList.h" /* HTList object */ -#include "HTAlert.h" /* HTConfirm(), HTPrompt() */ -#include "HTAAUtil.h" /* AA common to both sides */ -#include "HTAssoc.h" /* Assoc list */ -#include "HTAABrow.h" /* Implemented here */ -#include "HTUU.h" /* Uuencoding and uudecoding */ - -#include "LYLeaks.h" +#include <HTString.h> +#include <HTParse.h> /* URL parsing function */ +#include <HTList.h> /* HTList object */ +#include <HTAlert.h> /* HTConfirm(), HTPrompt() */ +#include <HTAAUtil.h> /* AA common to both sides */ +#include <HTAssoc.h> /* Assoc list */ +#include <HTAABrow.h> /* Implemented here */ +#include <HTUU.h> /* Uuencoding and uudecoding */ + +#include <LYLeaks.h> extern BOOL using_proxy; /* Are we using an HTTP gateway? */ diff --git a/WWW/Library/Implementation/HTAABrow.h b/WWW/Library/Implementation/HTAABrow.h index 80da3e6e..9512603a 100644 --- a/WWW/Library/Implementation/HTAABrow.h +++ b/WWW/Library/Implementation/HTAABrow.h @@ -32,9 +32,9 @@ #define HTAABROW_H #ifndef HTUTILS_H -#include "HTUtils.h" /* BOOL, PARAMS, ARGS */ +#include <HTUtils.h> /* BOOL, PARAMS, ARGS */ #endif /* HTUTILS_H */ -#include "HTAAUtil.h" /* Common parts of AA */ +#include <HTAAUtil.h> /* Common parts of AA */ #ifdef SHORT_NAMES diff --git a/WWW/Library/Implementation/HTAAFile.c b/WWW/Library/Implementation/HTAAFile.c index a55b2f89..96b07faa 100644 --- a/WWW/Library/Implementation/HTAAFile.c +++ b/WWW/Library/Implementation/HTAAFile.c @@ -16,16 +16,16 @@ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "tcp.h" /* Macro FROMASCII() */ +#include <tcp.h> /* Macro FROMASCII() */ /*#include <stdio.h> included by HTUtils.h -- FM *//* FILE */ #include <string.h> -#include "HTAAUtil.h" /* Common utilities used in AA */ -#include "HTAAFile.h" /* Implemented here */ +#include <HTAAUtil.h> /* Common utilities used in AA */ +#include <HTAAFile.h> /* Implemented here */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define SPACE ' ' #define TAB '\t' diff --git a/WWW/Library/Implementation/HTAAFile.h b/WWW/Library/Implementation/HTAAFile.h index f6f8ac50..e20735c7 100644 --- a/WWW/Library/Implementation/HTAAFile.h +++ b/WWW/Library/Implementation/HTAAFile.h @@ -16,10 +16,10 @@ #define HTAAFILE_H #ifndef HTUTILS_H -#include "HTUtils.h" /* BOOL, PARAMS, ARGS */ +#include <HTUtils.h> /* BOOL, PARAMS, ARGS */ #endif /* HTUTILS_H */ /*#include <stdio.h> included by HTUtils.h -- FM *//* FILE */ -#include "HTList.h" /* HTList */ +#include <HTList.h> /* HTList */ #ifdef SHORT_NAMES #define HTAAFnRe HTAAFile_nextRec diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c index 9b40c3be..6bf8ab3f 100644 --- a/WWW/Library/Implementation/HTAAProt.c +++ b/WWW/Library/Implementation/HTAAProt.c @@ -17,7 +17,7 @@ ** */ -#include "HTUtils.h" +#include <HTUtils.h> #include <string.h> #ifndef VMS @@ -27,13 +27,13 @@ #endif /* NOUSERS */ #endif /* not VMS */ -#include "HTAAUtil.h" -#include "HTAAFile.h" -#include "HTLex.h" /* Lexical analysor */ -#include "HTAssoc.h" /* Association list */ -#include "HTAAProt.h" /* Implemented here */ +#include <HTAAUtil.h> +#include <HTAAFile.h> +#include <HTLex.h> /* Lexical analysor */ +#include <HTAssoc.h> /* Association list */ +#include <HTAAProt.h> /* Implemented here */ -#include "LYLeaks.h" +#include <LYLeaks.h> /* ** Protection setup caching diff --git a/WWW/Library/Implementation/HTAAProt.h b/WWW/Library/Implementation/HTAAProt.h index 73bb7c45..b4d00f49 100644 --- a/WWW/Library/Implementation/HTAAProt.h +++ b/WWW/Library/Implementation/HTAAProt.h @@ -6,10 +6,10 @@ #define HTAAPROT_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTGroup.h" -#include "HTAssoc.h" +#include <HTGroup.h> +#include <HTAssoc.h> #ifdef SHORT_NAMES #define HTAAgUid HTAA_getUid diff --git a/WWW/Library/Implementation/HTAAServ.c b/WWW/Library/Implementation/HTAAServ.c index cb8623d7..98779830 100644 --- a/WWW/Library/Implementation/HTAAServ.c +++ b/WWW/Library/Implementation/HTAAServ.c @@ -41,26 +41,26 @@ ** */ -#include "HTUtils.h" +#include <HTUtils.h> /*#include <stdio.h> included by HTUtils.h -- FM *//* FILE */ #include <string.h> /* strchr() */ -#include "HTString.h" -#include "HTAccess.h" /* HTSecure */ -#include "HTFile.h" /* HTLocalName */ -#include "HTRules.h" /* */ -#include "HTParse.h" /* URL parsing function */ -#include "HTList.h" /* HTList object */ - -#include "HTAAUtil.h" /* AA common parts */ -#include "HTAuth.h" /* Authentication */ -#include "HTACL.h" /* Access Control List */ -#include "HTGroup.h" /* Group handling */ -#include "HTAAProt.h" /* Protection file parsing */ -#include "HTAAServ.h" /* Implemented here */ - -#include "LYLeaks.h" +#include <HTString.h> +#include <HTAccess.h> /* HTSecure */ +#include <HTFile.h> /* HTLocalName */ +#include <HTRules.h> /* */ +#include <HTParse.h> /* URL parsing function */ +#include <HTList.h> /* HTList object */ + +#include <HTAAUtil.h> /* AA common parts */ +#include <HTAuth.h> /* Authentication */ +#include <HTACL.h> /* Access Control List */ +#include <HTGroup.h> /* Group handling */ +#include <HTAAProt.h> /* Protection file parsing */ +#include <HTAAServ.h> /* Implemented here */ + +#include <LYLeaks.h> /* ** Global variables diff --git a/WWW/Library/Implementation/HTAAServ.h b/WWW/Library/Implementation/HTAAServ.h index dc03c7dd..fdee1c2b 100644 --- a/WWW/Library/Implementation/HTAAServ.h +++ b/WWW/Library/Implementation/HTAAServ.h @@ -32,12 +32,12 @@ #define HTAASERV_H #ifndef HTUTILS_H -#include "HTUtils.h" /* BOOL, PARAMS, ARGS */ +#include <HTUtils.h> /* BOOL, PARAMS, ARGS */ #endif /* HTUTILS_H */ /*#include <stdio.h> included by HTUtils.h -- FM *//* FILE */ -#include "HTRules.h" /* This module interacts with rule system */ -#include "HTAAUtil.h" /* Common parts of AA */ -#include "HTAuth.h" /* Authentication */ +#include <HTRules.h> /* This module interacts with rule system */ +#include <HTAAUtil.h> /* Common parts of AA */ +#include <HTAuth.h> /* Authentication */ #ifdef SHORT_NAMES diff --git a/WWW/Library/Implementation/HTAAUtil.c b/WWW/Library/Implementation/HTAAUtil.c index a7cad59b..b10dcde0 100644 --- a/WWW/Library/Implementation/HTAAUtil.c +++ b/WWW/Library/Implementation/HTAAUtil.c @@ -44,15 +44,15 @@ ** */ -#include "HTUtils.h" -#include "tcp.h" /* NETREAD() etc. */ +#include <HTUtils.h> +#include <tcp.h> /* NETREAD() etc. */ #include <string.h> -#include "HTAAUtil.h" /* Implemented here */ -#include "HTAssoc.h" /* Assoc list */ -#include "HTTCP.h" -#include "HTAlert.h" +#include <HTAAUtil.h> /* Implemented here */ +#include <HTAssoc.h> /* Assoc list */ +#include <HTTCP.h> +#include <HTAlert.h> -#include "LYLeaks.h" +#include <LYLeaks.h> /* PUBLIC HTAAScheme_enum() ** TRANSLATE SCHEME NAME INTO diff --git a/WWW/Library/Implementation/HTAAUtil.h b/WWW/Library/Implementation/HTAAUtil.h index 226f1547..2f353a63 100644 --- a/WWW/Library/Implementation/HTAAUtil.h +++ b/WWW/Library/Implementation/HTAAUtil.h @@ -31,10 +31,10 @@ #define HTAAUTIL_H #ifndef HTUTILS_H -#include "HTUtils.h" /* BOOL, PARAMS, ARGS */ +#include <HTUtils.h> /* BOOL, PARAMS, ARGS */ #endif /* HTUTILS_H */ -#include "tcp.h" -#include "HTList.h" +#include <tcp.h> +#include <HTList.h> #ifdef SHORT_NAMES #define HTAASenu HTAAScheme_enum diff --git a/WWW/Library/Implementation/HTACL.c b/WWW/Library/Implementation/HTACL.c index 2147e23f..fe4e02e4 100644 --- a/WWW/Library/Implementation/HTACL.c +++ b/WWW/Library/Implementation/HTACL.c @@ -16,16 +16,16 @@ */ -#include "HTUtils.h" +#include <HTUtils.h> /*#include <stdio.h> included by HTUtils.h -- FM *//* FILE */ #include <string.h> -#include "HTAAFile.h" /* File routines */ -#include "HTGroup.h" /* GroupDef */ -#include "HTACL.h" /* Implemented here */ +#include <HTAAFile.h> /* File routines */ +#include <HTGroup.h> /* GroupDef */ +#include <HTACL.h> /* Implemented here */ -#include "LYLeaks.h" +#include <LYLeaks.h> /* PRIVATE HTAA_getAclFilename() ** RESOLVE THE FULL PATHNAME OF ACL FILE FOR A GIVEN FILE diff --git a/WWW/Library/Implementation/HTACL.h b/WWW/Library/Implementation/HTACL.h index c0367c9d..3dfef27c 100644 --- a/WWW/Library/Implementation/HTACL.h +++ b/WWW/Library/Implementation/HTACL.h @@ -6,10 +6,10 @@ #define HTACL_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTAAUtil.h" -#include "HTGroup.h" +#include <HTAAUtil.h> +#include <HTGroup.h> #ifdef SHORT_NAMES #define HTAAoACL HTAA_openAcl diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c index 7d4def15..df7f99c2 100644 --- a/WWW/Library/Implementation/HTAccess.c +++ b/WWW/Library/Implementation/HTAccess.c @@ -35,33 +35,33 @@ #define DIRECT_WAIS #endif /* VMS */ -#include "HTUtils.h" -#include "HTTP.h" -#include "HTAlert.h" +#include <HTUtils.h> +#include <HTTP.h> +#include <HTAlert.h> /* ** Implements: */ -#include "HTAccess.h" +#include <HTAccess.h> /* ** Uses: */ -#include "HTParse.h" -#include "HTML.h" /* SCW */ +#include <HTParse.h> +#include <HTML.h> /* SCW */ #ifndef NO_RULES -#include "HTRules.h" +#include <HTRules.h> #endif -#include "HTList.h" -#include "HText.h" /* See bugs above */ -#include "HTAlert.h" -#include "HTCJK.h" -#include "UCMap.h" -#include "GridText.h" +#include <HTList.h> +#include <HText.h> /* See bugs above */ +#include <HTAlert.h> +#include <HTCJK.h> +#include <UCMap.h> +#include <GridText.h> -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTAccess.h b/WWW/Library/Implementation/HTAccess.h index 2826d13a..1954e6de 100644 --- a/WWW/Library/Implementation/HTAccess.h +++ b/WWW/Library/Implementation/HTAccess.h @@ -16,11 +16,11 @@ extern char * use_this_url_instead; /* Definition uses: */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "tcp.h" -#include "HTAnchor.h" -#include "HTFormat.h" +#include <tcp.h> +#include <HTAnchor.h> +#include <HTFormat.h> #ifdef SHORT_NAMES #define HTClientHost HTClHost diff --git a/WWW/Library/Implementation/HTAlert.c b/WWW/Library/Implementation/HTAlert.c deleted file mode 100644 index 799db6cb..00000000 --- a/WWW/Library/Implementation/HTAlert.c +++ /dev/null @@ -1,126 +0,0 @@ -/* Displaying messages and getting input for LineMode Browser -** ========================================================== -** -** REPLACE THIS MODULE with a GUI version in a GUI environment! -** -** History: -** Jun 92 Created May 1992 By C.T. Barker -** Feb 93 Simplified, portablised TBL -** Sep 93 Corrected 3 bugs in HTConfirm() :-( AL -*/ - - -#include "HTUtils.h" -#include "tcp.h" /* for TOUPPER */ - -#include "HTAlert.h" - -#include <ctype.h> /* for toupper - should be in tcp.h */ -#ifdef VMS -extern char * getpass PARAMS((CONST char *prompt)); -#endif /* VMS */ - -#include "LYLeaks.h" - -PUBLIC void HTAlert ARGS1(CONST char *, Msg) -{ -#ifdef NeXTStep - NXRunAlertPanel(NULL, "%s", NULL, NULL, NULL, Msg); -#else - fprintf(stderr, "WWW Alert: %s\n", Msg); -#endif -} - - -PUBLIC void HTProgress ARGS1(CONST char *, Msg) -{ - fprintf(stderr, " %s ...\n", Msg); -} - - -PUBLIC BOOL HTConfirm ARGS1(CONST char *, Msg) -{ - char Reply[4]; /* One more for terminating NULL -- AL */ - char *URep; - - fprintf(stderr, "WWW: %s (y/n) ", Msg); - /* (y/n) came twice -- AL */ - - fgets(Reply, 4, stdin); /* get reply, max 3 characters */ - URep=Reply; - while (*URep) { - if (*URep == '\n') { - *URep = (char)0; /* Overwrite newline */ - break; - } - *URep=TOUPPER(*URep); - URep++; /* This was previously embedded in the TOUPPER */ - /* call an it became evaluated twice because */ - /* TOUPPER is a macro -- AL */ - } - - if ((strcmp(Reply,"YES")==0) || (strcmp(Reply,"Y")==0)) - return(YES); - else - return(NO); -} - -/* Prompt for answer and get text back -*/ -PUBLIC char * HTPrompt ARGS2(CONST char *, Msg, CONST char *, deflt) -{ - char Tmp[200]; - char * rep = 0; - fprintf(stderr, "WWW: %s", Msg); - if (deflt) fprintf(stderr, " (RETURN for [%s]) ", deflt); - - fgets(Tmp, 200, stdin); - Tmp[strlen(Tmp)-1] = (char)0; /* Overwrite newline */ - - StrAllocCopy(rep, *Tmp ? Tmp : deflt); - return rep; -} - - -/* Prompt for password without echoing the reply -*/ -PUBLIC char * HTPromptPassword ARGS1(CONST char *, Msg) -{ - char *result = NULL; - char *pw = (char*)getpass(Msg ? Msg : "Password: "); - - StrAllocCopy(result, pw); - return result; -} - - -/* Prompt both username and password HTPromptUsernameAndPassword() -** --------------------------------- -** On entry, -** Msg is the prompting message. -** *username and -** *password are char pointers; they are changed -** to point to result strings. -** -** If *username is not NULL, it is taken -** to point to a default value. -** Initial value of *password is -** completely discarded. -** -** On exit, -** *username and *password point to newly allocated -** strings -- original strings pointed to by them -** are NOT freed. -** -*/ -PUBLIC void HTPromptUsernameAndPassword ARGS4(CONST char *, Msg, - char **, username, - char **, password, - BOOL, IsProxy) -{ - if (Msg) - fprintf(stderr, "WWW: %s\n", Msg); - *username = HTPrompt("Username: ", *username); - *password = HTPromptPassword("Password: "); -} - diff --git a/WWW/Library/Implementation/HTAlert.h b/WWW/Library/Implementation/HTAlert.h deleted file mode 100644 index 03b970b6..00000000 --- a/WWW/Library/Implementation/HTAlert.h +++ /dev/null @@ -1,128 +0,0 @@ -/* */ - -/* Displaying messages and getting input for WWW Library -** ===================================================== -** -** May 92 Created By C.T. Barker -** Feb 93 Portablized etc TBL -*/ - -#ifndef HTUTILS_H -#include "HTUtils.h" -#endif /* HTUTILS_H */ -#include "tcp.h" - -/* Display a message and get the input -** -** On entry, -** Msg is the message. -** -** On exit, -** Return value is malloc'd string which must be freed. -*/ -extern char * HTPrompt PARAMS((CONST char * Msg, CONST char * deflt)); - - -/* Display a message, don't wait for input -** -** On entry, -** The input is a list of parameters for printf. -*/ -extern void HTAlert PARAMS((CONST char * Msg)); - - -/* Display a progress message for information (and diagnostics) only -** -** On entry, -** The input is a list of parameters for printf. -*/ -extern void HTProgress PARAMS((CONST char * Msg)); -extern BOOLEAN mustshow; -#define _HTProgress(msg) mustshow = TRUE, HTProgress(msg) - - -/* Display a message, then wait for 'yes' or 'no'. -** -** On entry, -** Takes a list of parameters for printf. -** -** On exit, -** If the user enters 'YES', returns TRUE, returns FALSE -** otherwise. -*/ -extern BOOL HTConfirm PARAMS ((CONST char * Msg)); - - -/* Prompt for password without echoing the reply -*/ -extern char * HTPromptPassword PARAMS((CONST char * Msg)); - -/* Prompt both username and password HTPromptUsernameAndPassword() -** --------------------------------- -** On entry, -** Msg is the prompting message. -** *username and -** *password are char pointers; they are changed -** to point to result strings. -** IsProxy should be TRUE if this is for -** proxy authentication. -** -** If *username is not NULL, it is taken -** to point to a default value. -** Initial value of *password is -** completely discarded. -** -** On exit, -** *username and *password point to newly allocated -** strings -- original strings pointed to by them -** are NOT freed. -** -*/ -extern void HTPromptUsernameAndPassword PARAMS(( - CONST char * Msg, - char ** username, - char ** password, - BOOL IsProxy)); - - -/* Confirm a cookie operation. HTConfirmCookie() -** --------------------------- -** -** On entry, -** server is the server sending the Set-Cookie. -** domain is the domain of the cookie. -** path is the path of the cookie. -** name is the name of the cookie. -** value is the value of the cookie. -** -** On exit, -** Returns FALSE on cancel, -** TRUE if the cookie should be set. -*/ -extern BOOL HTConfirmCookie PARAMS(( - void * dp, - CONST char * server, - CONST char * domain, - CONST char * path, - CONST char * name, - CONST char * value)); - - -/* Confirm redirection of POST. HTConfirmPostRedirect() -** ---------------------------- -** On entry, -** redirecting_url is the Location. -** server_status is the server status code. -** -** On exit, -** Returns 0 on cancel, -** 1 for redirect of POST with content, -** 303 for redirect as GET without content -*/ -extern int HTConfirmPostRedirect PARAMS(( - CONST char * redirecting_url_arg, - int server_status)); - -/* - - */ diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c index 6f8c0d3f..9c8b10cd 100644 --- a/WWW/Library/Implementation/HTAnchor.c +++ b/WWW/Library/Implementation/HTAnchor.c @@ -15,16 +15,16 @@ #define HASH_SIZE 101 /* Arbitrary prime. Memory/speed tradeoff */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> #include <ctype.h> -#include "HTAnchor.h" -#include "HTParse.h" -#include "UCAux.h" -#include "UCMap.h" +#include <HTAnchor.h> +#include <HTParse.h> +#include <UCAux.h> +#include <UCMap.h> -#include "LYCharSets.h" -#include "LYLeaks.h" +#include <LYCharSets.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTAnchor.h b/WWW/Library/Implementation/HTAnchor.h index e3847184..2d9c43b9 100644 --- a/WWW/Library/Implementation/HTAnchor.h +++ b/WWW/Library/Implementation/HTAnchor.h @@ -14,9 +14,9 @@ /* Version 0 (TBL) written in Objective-C for the NeXT browser */ /* Version 1 of 24-Oct-1991 (JFG), written in C, browser-independant */ -#include "HTList.h" -#include "HTAtom.h" -#include "UCDefs.h" +#include <HTList.h> +#include <HTAtom.h> +#include <UCDefs.h> #ifdef SHORT_NAMES #define HTAnchor_findChild HTAnFiCh @@ -57,7 +57,7 @@ typedef struct _HTAnchor HTAnchor; typedef struct _HTParentAnchor HTParentAnchor; /* After definition of HTFormat: */ -#include "HTFormat.h" +#include <HTFormat.h> typedef HTAtom HTLinkType; diff --git a/WWW/Library/Implementation/HTAssoc.c b/WWW/Library/Implementation/HTAssoc.c index e63c0213..0736a269 100644 --- a/WWW/Library/Implementation/HTAssoc.c +++ b/WWW/Library/Implementation/HTAssoc.c @@ -17,15 +17,15 @@ */ -#include "HTUtils.h" +#include <HTUtils.h> #include <string.h> -#include "HTAAUtil.h" -#include "HTAssoc.h" -#include "HTString.h" +#include <HTAAUtil.h> +#include <HTAssoc.h> +#include <HTString.h> -#include "LYLeaks.h" +#include <LYLeaks.h> PUBLIC HTAssocList *HTAssocList_new NOARGS { diff --git a/WWW/Library/Implementation/HTAssoc.h b/WWW/Library/Implementation/HTAssoc.h index 71b0c918..79cbe557 100644 --- a/WWW/Library/Implementation/HTAssoc.h +++ b/WWW/Library/Implementation/HTAssoc.h @@ -8,9 +8,9 @@ #define HTASSOC_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTList.h" +#include <HTList.h> #ifdef SHORT_NAMES diff --git a/WWW/Library/Implementation/HTAtom.c b/WWW/Library/Implementation/HTAtom.c index 8fc95d16..e5aee433 100644 --- a/WWW/Library/Implementation/HTAtom.c +++ b/WWW/Library/Implementation/HTAtom.c @@ -12,18 +12,18 @@ ** (c) Copyright CERN 1991 - See Copyright.html ** */ -#include "HTUtils.h" +#include <HTUtils.h> #define HASH_SIZE 101 /* Tunable */ -#include "HTAtom.h" +#include <HTAtom.h> /*#include <stdio.h> included by HTUtils.h -- FM *//* joe@athena, TBL 921019 */ #include <string.h> -#include "HTList.h" +#include <HTList.h> -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTAtom.h b/WWW/Library/Implementation/HTAtom.h index b8dd10ec..c3319a3d 100644 --- a/WWW/Library/Implementation/HTAtom.h +++ b/WWW/Library/Implementation/HTAtom.h @@ -22,9 +22,9 @@ #define HTATOM_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTList.h" +#include <HTList.h> #ifdef SHORT_NAMES #define HTAt_for HTAtom_for diff --git a/WWW/Library/Implementation/HTAuth.c b/WWW/Library/Implementation/HTAuth.c index c3364db9..b8b4d010 100644 --- a/WWW/Library/Implementation/HTAuth.c +++ b/WWW/Library/Implementation/HTAuth.c @@ -13,14 +13,14 @@ ** */ -#include "HTUtils.h" +#include <HTUtils.h> #include <string.h> -#include "HTPasswd.h" /* Password file routines */ -#include "HTAssoc.h" -#include "HTAuth.h" /* Implemented here */ -#include "HTUU.h" /* Uuencoding and uudecoding */ +#include <HTPasswd.h> /* Password file routines */ +#include <HTAssoc.h> +#include <HTAuth.h> /* Implemented here */ +#include <HTUU.h> /* Uuencoding and uudecoding */ -#include "LYLeaks.h" +#include <LYLeaks.h> /* PRIVATE decompose_auth_string() ** DECOMPOSE AUTHENTICATION STRING diff --git a/WWW/Library/Implementation/HTAuth.h b/WWW/Library/Implementation/HTAuth.h index 6dc4c516..f81eb1eb 100644 --- a/WWW/Library/Implementation/HTAuth.h +++ b/WWW/Library/Implementation/HTAuth.h @@ -9,10 +9,10 @@ #define HTAUTH_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTAAUtil.h" -#include "HTAAProt.h" +#include <HTAAUtil.h> +#include <HTAAProt.h> #ifdef SHORT_NAMES diff --git a/WWW/Library/Implementation/HTBTree.c b/WWW/Library/Implementation/HTBTree.c index 6515be77..986dfc8b 100644 --- a/WWW/Library/Implementation/HTBTree.c +++ b/WWW/Library/Implementation/HTBTree.c @@ -7,8 +7,8 @@ */ -#include "HTUtils.h" -#include "HTBTree.h" +#include <HTUtils.h> +#include <HTBTree.h> #ifndef __STRICT_BSD__ #include <stdlib.h> #endif @@ -16,7 +16,7 @@ #define MAXIMUM(a,b) ((a)>(b)?(a):(b)) -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTChunk.c b/WWW/Library/Implementation/HTChunk.c index fd66a482..db06f64e 100644 --- a/WWW/Library/Implementation/HTChunk.c +++ b/WWW/Library/Implementation/HTChunk.c @@ -3,11 +3,11 @@ ** */ -#include "HTUtils.h" -#include "HTChunk.h" +#include <HTUtils.h> +#include <HTChunk.h> /*#include <stdio.h> included by HTUtils.h -- FM */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTChunk.h b/WWW/Library/Implementation/HTChunk.h index 37ef890c..84c12de7 100644 --- a/WWW/Library/Implementation/HTChunk.h +++ b/WWW/Library/Implementation/HTChunk.h @@ -7,7 +7,7 @@ automatically reallocating them as necessary. */ -#include "UCMap.h" +#include <UCMap.h> typedef struct { int size; /* In bytes */ diff --git a/WWW/Library/Implementation/HTDOS.c b/WWW/Library/Implementation/HTDOS.c index 5e22915b..37e15962 100644 --- a/WWW/Library/Implementation/HTDOS.c +++ b/WWW/Library/Implementation/HTDOS.c @@ -67,10 +67,11 @@ char * HTDOS_name(char *wwwname) } } -/* if(strlen(cp_url) < 4) cp_url[] = ':'; - if(strlen(cp_url) == 3) cp_url[3] = '\\'; + /* Needed to surf the root of a local drive. */ - if(strlen(cp_url) == 4) cp_url[4] = '.'; */ + if(strlen(cp_url) < 4) cp_url[2] = ':'; + if(strlen(cp_url) == 3) cp_url[3] = '\\'; + if(strlen(cp_url) == 4) cp_url[4] = '.'; if((strlen(cp_url) > 2) && (cp_url[1] == '|')) cp_url[1] = ':'; diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c index 8c014f76..48d0aa36 100644 --- a/WWW/Library/Implementation/HTFTP.c +++ b/WWW/Library/Implementation/HTFTP.c @@ -20,8 +20,8 @@ ** Authors ** TBL Tim Berners-lee <timbl@info.cern.ch> ** DD Denis DeLaRoca 310 825-4580 <CSP1DWD@mvs.oac.ucla.edu> -** LM Lou Montulli <montulli@ukanaix.cc.ukans.edu> -** FM Foteos Macrides <macrides@sci.wfeb.edu> +** LM Lou Montulli <montulli@ukanaix.cc.ukans.edu> +** FM Foteos Macrides <macrides@sci.wfeb.edu> ** History: ** 2 May 91 Written TBL, as a part of the WorldWideWeb project. ** 15 Jan 92 Bug fix: close() was used for NETCLOSE for control soc @@ -29,14 +29,14 @@ ** 8 Dec 92 Bug fix 921208 TBL after DD ** 17 Dec 92 Anon FTP password now just WWWuser@ suggested by DD ** fails on princeton.edu! -** 27 Dec 93 (FM) Fixed up so FTP now works with VMS hosts. Path +** 27 Dec 93 (FM) Fixed up so FTP now works with VMS hosts. Path ** must be Unix-style and cannot include the device ** or top directory. -** ?? ??? ?? (LM) Added code to prompt and send passwords for non +** ?? ??? ?? (LM) Added code to prompt and send passwords for non ** anonymous FTP -** 25 Mar 94 (LM) Added code to recognize different ftp server types -** and code to parse dates and sizes on most hosts. -** 27 Mar 93 (FM) Added code for getting dates and sizes on VMS hosts. +** 25 Mar 94 (LM) Added code to recognize different ftp server types +** and code to parse dates and sizes on most hosts. +** 27 Mar 93 (FM) Added code for getting dates and sizes on VMS hosts. ** ** Options: ** LISTEN We listen, the other guy connects for data. @@ -44,8 +44,8 @@ ** internet address! ** ** Notes: -** Portions Copyright 1994 Trustees of Dartmouth College -** Code for recognizing different FTP servers and +** Portions Copyright 1994 Trustees of Dartmouth College +** Code for recognizing different FTP servers and ** parsing "ls -l" output taken from Macintosh Fetch ** program with permission from Jim Matthews, ** Dartmouth Software Development Team. @@ -61,7 +61,7 @@ #endif /* !NOPORT */ /* -BUGS: @@@ Limit connection cache size! +BUGS: @@@ Limit connection cache size! Error reporting to user. 400 & 500 errors are acked by user with windows. Use configuration file for user names @@ -75,12 +75,12 @@ BUGS: @@@ Limit connection cache size! #define u_long unsigned long #endif -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "HTAlert.h" +#include <HTAlert.h> -#include "HTFTP.h" /* Implemented here */ +#include <HTFTP.h> /* Implemented here */ /* this define should be in HTFont.h :( */ #define HT_NON_BREAK_SPACE ((char)1) /* For now */ @@ -99,23 +99,23 @@ BUGS: @@@ Limit connection cache size! #define INFINITY 512 -#include "HTParse.h" -#include "HTTCP.h" -#include "HTAnchor.h" -#include "HTFile.h" /* For HTFileFormat() */ -#include "HTBTree.h" -#include "HTChunk.h" -#include "HTAlert.h" +#include <HTParse.h> +#include <HTTCP.h> +#include <HTAnchor.h> +#include <HTFile.h> /* For HTFileFormat() */ +#include <HTBTree.h> +#include <HTChunk.h> +#include <HTAlert.h> #ifndef IPPORT_FTP #define IPPORT_FTP 21 #endif /* !IPORT_FTP */ -#include "LYLeaks.h" +#include <LYLeaks.h> typedef struct _connection { struct _connection * next; /* Link on list */ u_long addr; /* IP address */ - int socket; /* Socket number for communication */ + int socket; /* Socket number for communication */ BOOL binary; /* Binary mode? */ } connection; @@ -125,7 +125,7 @@ typedef struct _connection { /* Hypertext object building machinery */ -#include "HTML.h" +#include <HTML.h> #define PUTC(c) (*targetClass.put_character)(target, c) #define PUTS(s) (*targetClass.put_string)(target, s) @@ -168,37 +168,37 @@ PRIVATE char *user_entered_password = NULL; PRIVATE char *last_username_and_host = NULL; #define GENERIC_SERVER 0 -#define MACHTEN_SERVER 1 -#define UNIX_SERVER 2 -#define VMS_SERVER 3 -#define CMS_SERVER 4 -#define DCTS_SERVER 5 +#define MACHTEN_SERVER 1 +#define UNIX_SERVER 2 +#define VMS_SERVER 3 +#define CMS_SERVER 4 +#define DCTS_SERVER 5 #define TCPC_SERVER 6 #define PETER_LEWIS_SERVER 7 #define NCSA_SERVER 8 #define WINDOWS_NT_SERVER 9 #define MS_WINDOWS_SERVER 10 -#define MSDOS_SERVER 11 +#define MSDOS_SERVER 11 #define APPLESHARE_SERVER 12 #define NETPRESENZ_SERVER 13 -PRIVATE int server_type = GENERIC_SERVER; /* the type of ftp host */ -PRIVATE int unsure_type = FALSE; /* sure about the type? */ +PRIVATE int server_type = GENERIC_SERVER; /* the type of ftp host */ +PRIVATE int unsure_type = FALSE; /* sure about the type? */ PRIVATE BOOLEAN use_list = FALSE; /* use the LIST command? */ PRIVATE int interrupted_in_next_data_char = FALSE; #ifdef POLL_PORTS -PRIVATE unsigned short port_number = FIRST_TCP_PORT; +PRIVATE unsigned short port_number = FIRST_TCP_PORT; #endif /* POLL_PORTS */ #ifdef LISTEN -PRIVATE int master_socket = -1; /* Listening socket = invalid */ +PRIVATE int master_socket = -1; /* Listening socket = invalid */ PRIVATE char port_command[255]; /* Command for setting the port */ -PRIVATE fd_set open_sockets; /* Mask of active channels */ -PRIVATE int num_sockets; /* Number of sockets to scan */ +PRIVATE fd_set open_sockets; /* Mask of active channels */ +PRIVATE int num_sockets; /* Number of sockets to scan */ #else -PRIVATE unsigned short passive_port; /* Port server specified for data */ +PRIVATE unsigned short passive_port; /* Port server specified for data */ #endif /* LISTEN */ @@ -236,7 +236,7 @@ PRIVATE void free_FTPGlobals NOARGS ** ON EXIT: ** returns vms file specification ** -** Bug: Returns pointer to static -- non-reentrant +** Bug: Returns pointer to static -- non-reentrant */ PUBLIC char * HTMake_VMS_name ARGS2( CONST char *, nn, @@ -254,25 +254,25 @@ PUBLIC char * HTMake_VMS_name ARGS2( char * filename = (char*)malloc(strlen(fn)+1); char * nodename = (char*)malloc(strlen(nn)+2+1); /* Copies to hack */ char *second; /* 2nd slash */ - char *last; /* last slash */ + char *last; /* last slash */ CONST char * hostname = HTHostName(); if (!filename || !nodename) - outofmem(__FILE__, "HTVMSname"); + outofmem(__FILE__, "HTVMSname"); strcpy(filename, fn); strcpy(nodename, ""); /* On same node? Yes if node names match */ if (strncmp(nn, "localhost", 9)) { - CONST char *p; + CONST char *p; char *q; - for (p = hostname, q = (char *)nn; + for (p = hostname, q = (char *)nn; *p && *p != '.' && *q && *q != '.'; p++, q++){ if (TOUPPER(*p) != TOUPPER(*q)) { - strcpy(nodename, nn); + strcpy(nodename, nn); q = strchr(nodename, '.'); /* Mismatch */ if (q) *q = '\0'; /* Chop domain */ - strcat(nodename, "::"); /* Try decnet anyway */ + strcat(nodename, "::"); /* Try decnet anyway */ break; } } @@ -284,19 +284,19 @@ PUBLIC char * HTMake_VMS_name ARGS2( if (!second) { /* Only one slash */ sprintf(vmsname, "%s%s", nodename, filename + 1); } else if (second == last) { /* Exactly two slashes */ - *second = '\0'; /* Split filename from disk */ + *second = '\0'; /* Split filename from disk */ sprintf(vmsname, "%s%s:%s", nodename, filename+1, second+1); *second = '/'; /* restore */ - } else { /* More than two slashes */ + } else { /* More than two slashes */ char * p; - *second = '\0'; /* Split disk from directories */ + *second = '\0'; /* Split disk from directories */ *last = '\0'; /* Split dir from filename */ sprintf(vmsname, "%s%s:[%s]%s", nodename, filename+1, second+1, last+1); *second = *last = '/'; /* restore filename */ for (p = strchr(vmsname, '['); *p!=']'; p++) if (*p == '/') - *p = '.'; /* Convert dir sep. to dots */ + *p = '.'; /* Convert dir sep. to dots */ } FREE(nodename); FREE(filename); @@ -312,15 +312,15 @@ PRIVATE char next_data_char NOARGS if (data_read_pointer >= data_write_pointer) { status = NETREAD(data_soc, data_buffer, DATA_BUFFER_SIZE); if (status == HT_INTERRUPTED) - interrupted_in_next_data_char = 1; + interrupted_in_next_data_char = 1; if (status <= 0) - return (char)-1; + return (char)-1; data_write_pointer = data_buffer + status; data_read_pointer = data_buffer; } #ifdef NOT_ASCII { - char c = *data_read_pointer++; + char c = *data_read_pointer++; return FROMASCII(c); } #else @@ -338,7 +338,7 @@ PRIVATE int close_connection ARGS1( connection * scan; int status = NETCLOSE(con->socket); if (TRACE) { - fprintf(stderr, "HTFTP: Closing control socket %d\n", con->socket); + fprintf(stderr, "HTFTP: Closing control socket %d\n", con->socket); #ifdef UNIX if (status != 0) perror("HTFTP:close_connection"); @@ -346,14 +346,14 @@ PRIVATE int close_connection ARGS1( } con->socket = -1; if (connections == con) { - connections = con->next; + connections = con->next; return status; } for (scan = connections; scan; scan = scan->next) { - if (scan->next == con) { + if (scan->next == con) { scan->next = con->next; /* Unlink */ if (control == con) - control = (connection*)0; + control = (connection*)0; return status; } /*if */ } /* for */ @@ -368,12 +368,12 @@ PRIVATE void init_help_message_cache NOARGS } PRIVATE void help_message_cache_add ARGS1( - char *, string) + char *, string) { if (help_message_buffer) - StrAllocCat(help_message_buffer, string); + StrAllocCat(help_message_buffer, string); else - StrAllocCopy(help_message_buffer, string); + StrAllocCopy(help_message_buffer, string); if (TRACE) fprintf(stderr,"Adding message to help cache: %s\n",string); @@ -410,14 +410,14 @@ PRIVATE char *help_message_cache_contents NOARGS ** or negative for communication failure. */ PRIVATE int response ARGS1( - char *, cmd) + char *, cmd) { - int result; /* Three-digit decimal code */ - int continuation_response = -1; + int result; /* Three-digit decimal code */ + int continuation_response = -1; int status; if (!control) { - if (TRACE) + if (TRACE) fprintf(stderr, "HTFTP: No control connection set up!!\n"); return -99; } @@ -429,15 +429,15 @@ PRIVATE int response ARGS1( { char * p; for (p = cmd; *p; p++) { - *p = TOASCII(*p); + *p = TOASCII(*p); } } #endif /* NOT_ASCII */ status = NETWRITE(control->socket, cmd, (int)strlen(cmd)); if (status < 0) { if (TRACE) - fprintf(stderr, - "HTFTP: Error %d sending command: closing socket %d\n", + fprintf(stderr, + "HTFTP: Error %d sending command: closing socket %d\n", status, control->socket); close_connection(control); return status; @@ -452,21 +452,21 @@ PRIVATE int response ARGS1( char continuation; - if (interrupted_in_htgetcharacter) - { - if (TRACE) - fprintf (stderr, - "HTFTP: Interrupted in HTGetCharacter, apparently.\n"); - NETCLOSE (control->socket); - control->socket = -1; - return HT_INTERRUPTED; - } + if (interrupted_in_htgetcharacter) + { + if (TRACE) + fprintf (stderr, + "HTFTP: Interrupted in HTGetCharacter, apparently.\n"); + NETCLOSE (control->socket); + control->socket = -1; + return HT_INTERRUPTED; + } *p = '\0'; /* Terminate the string */ if (TRACE) fprintf(stderr, " Rx: %s", response_text); - /* Check for login or help messages */ + /* Check for login or help messages */ if (!strncmp(response_text,"230-",4) || !strncmp(response_text,"250-",4) || !strncmp(response_text,"220-",4)) @@ -476,31 +476,31 @@ PRIVATE int response ARGS1( if (continuation_response == -1) { if (continuation == '-') /* start continuation */ continuation_response = result; - } else { /* continuing */ + } else { /* continuing */ if (continuation_response == result && continuation == ' ') - continuation_response = -1; /* ended */ + continuation_response = -1; /* ended */ } break; } /* if end of line */ if (interrupted_in_htgetcharacter) - { - if (TRACE) - fprintf (stderr, - "HTFTP: Interrupted in HTGetCharacter, apparently.\n"); - NETCLOSE (control->socket); - control->socket = -1; - return HT_INTERRUPTED; - } + { + if (TRACE) + fprintf (stderr, + "HTFTP: Interrupted in HTGetCharacter, apparently.\n"); + NETCLOSE (control->socket); + control->socket = -1; + return HT_INTERRUPTED; + } if (*(p-1) == (char) EOF) { if (TRACE) fprintf(stderr, "Error on rx: closing socket %d\n", - control->socket); + control->socket); strcpy(response_text, "000 *** TCP read error on response\n"); - close_connection(control); - return -1; /* End of file on response */ + close_connection(control); + return -1; /* End of file on response */ } } /* Loop over characters */ @@ -509,14 +509,14 @@ PRIVATE int response ARGS1( if (result == 421) { if (TRACE) fprintf(stderr, "HTFTP: They close so we close socket %d\n", - control->socket); + control->socket); close_connection(control); return -1; } if ((result == 255 && server_type == CMS_SERVER) && - (0 == strncasecomp(cmd, "CWD", 3) || + (0 == strncasecomp(cmd, "CWD", 3) || 0 == strcasecomp(cmd, "CDUP"))) { - /* + /* ** Alas, CMS returns 255 on failure to CWD to parent of root. - PG */ result = 555; @@ -529,7 +529,7 @@ PRIVATE int response ARGS1( * Some servers need an additional letter after the MACB command. */ PRIVATE int set_mac_binary ARGS1( - int, ServerType) + int, ServerType) { /* try to set mac binary mode */ if (ServerType == APPLESHARE_SERVER || @@ -556,50 +556,50 @@ PRIVATE void get_ftp_pwd ARGS2( /* get the working directory (to see what it looks like) */ int status = response("PWD\r\n"); if (status < 0) { - return; + return; } else { cp = strchr(response_text+5,'"'); if (cp) *cp = '\0'; - if (*ServerType == TCPC_SERVER) { - *ServerType = ((response_text[5] == '/') ? - NCSA_SERVER : TCPC_SERVER); + if (*ServerType == TCPC_SERVER) { + *ServerType = ((response_text[5] == '/') ? + NCSA_SERVER : TCPC_SERVER); if (TRACE) - fprintf(stderr, "HTFTP: Treating as %s server.\n", - ((*ServerType == NCSA_SERVER) ? - "NCSA" : "TCPC")); - } else if (response_text[5] == '/') { - /* path names beginning with / imply Unix, + fprintf(stderr, "HTFTP: Treating as %s server.\n", + ((*ServerType == NCSA_SERVER) ? + "NCSA" : "TCPC")); + } else if (response_text[5] == '/') { + /* path names beginning with / imply Unix, * right? */ if (set_mac_binary(*ServerType)) { *ServerType = NCSA_SERVER; if (TRACE) - fprintf(stderr, "HTFTP: Treating as NCSA server.\n"); + fprintf(stderr, "HTFTP: Treating as NCSA server.\n"); } else { - *ServerType = UNIX_SERVER; - *UseList = TRUE; + *ServerType = UNIX_SERVER; + *UseList = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as Unix server.\n"); + fprintf(stderr, "HTFTP: Treating as Unix server.\n"); } return; - } else if (response_text[strlen(response_text)-1] == ']') { - /* path names ending with ] imply VMS, right? */ - *ServerType = VMS_SERVER; + } else if (response_text[strlen(response_text)-1] == ']') { + /* path names ending with ] imply VMS, right? */ + *ServerType = VMS_SERVER; *UseList = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as VMS server.\n"); - } else { - *ServerType = GENERIC_SERVER; + fprintf(stderr, "HTFTP: Treating as VMS server.\n"); + } else { + *ServerType = GENERIC_SERVER; if (TRACE) - fprintf(stderr, "HTFTP: Treating as Generic server.\n"); + fprintf(stderr, "HTFTP: Treating as Generic server.\n"); } - if ((*ServerType == NCSA_SERVER) || - (*ServerType == TCPC_SERVER) || - (*ServerType == PETER_LEWIS_SERVER) || - (*ServerType == NETPRESENZ_SERVER)) - set_mac_binary(*ServerType); + if ((*ServerType == NCSA_SERVER) || + (*ServerType == TCPC_SERVER) || + (*ServerType == PETER_LEWIS_SERVER) || + (*ServerType == NETPRESENZ_SERVER)) + set_mac_binary(*ServerType); } } @@ -609,7 +609,7 @@ PRIVATE void get_ftp_pwd ARGS2( ** On entry, ** arg points to the name of the host in a hypertext address ** On exit, -** returns <0 if error +** returns <0 if error ** socket number if success ** ** This routine takes care of managing timed-out connections, and @@ -669,7 +669,7 @@ PRIVATE int get_connection ARGS2( if (p2 != NULL) { username = p1; - *p2 = '\0'; /* terminate */ + *p2 = '\0'; /* terminate */ p1 = p2+1; /* point to host */ pw = strchr(username, ':'); if (pw != NULL) { @@ -680,10 +680,10 @@ PRIVATE int get_connection ARGS2( HTUnEscape(username); /* - * If the password doesn't exist then we are going to have - * to ask the user for it. The only problem is that we - * don't want to ask for it every time, so we will store - * away in a primitive fashion. + * If the password doesn't exist then we are going to have + * to ask the user for it. The only problem is that we + * don't want to ask for it every time, so we will store + * away in a primitive fashion. */ if (!password) { char tmp[256]; @@ -700,7 +700,7 @@ PRIVATE int get_connection ARGS2( StrAllocCopy(last_username_and_host, tmp); sprintf(tmp, "Enter password for user %s@%s:", - username, p1); + username, p1); FREE(user_entered_password); user_entered_password = (char *)HTPromptPassword(tmp); @@ -718,42 +718,42 @@ PRIVATE int get_connection ARGS2( if (status < 0) { if (TRACE) - { - if (status == HT_INTERRUPTED) - fprintf (stderr, - "HTFTP: Interrupted on connect\n"); - else - fprintf(stderr, - "HTFTP: Unable to connect to remote host for `%s'.\n", - arg); - } + { + if (status == HT_INTERRUPTED) + fprintf (stderr, + "HTFTP: Interrupted on connect\n"); + else + fprintf(stderr, + "HTFTP: Unable to connect to remote host for `%s'.\n", + arg); + } if (status == HT_INTERRUPTED) { - _HTProgress ("Connection interrupted."); + _HTProgress ("Connection interrupted."); status = HT_NOT_LOADED; } else { - HTAlert("Unable to connect to FTP host."); + HTAlert("Unable to connect to FTP host."); } if (con->socket != -1) - { - NETCLOSE(con->socket); - } + { + NETCLOSE(con->socket); + } FREE(username); if (control == con) control = NULL; FREE(con); - return status; /* Bad return */ + return status; /* Bad return */ } if (TRACE) { - fprintf(stderr, "FTP connected, socket %d control %ld\n", + fprintf(stderr, "FTP connected, socket %d control %ld\n", con->socket, (long)con); } control = con; /* Current control connection */ /* Initialise buffering for control connection */ HTInitInput(control->socket); - init_help_message_cache(); /* Clear the login message buffer. */ + init_help_message_cache(); /* Clear the login message buffer. */ /* Now we log in Look up username, prompt for pw. @@ -762,13 +762,13 @@ PRIVATE int get_connection ARGS2( if (status == HT_INTERRUPTED) { - if (TRACE) - fprintf (stderr, - "HTFTP: Interrupted at beginning of login.\n"); - _HTProgress ("Connection interrupted."); - NETCLOSE(control->socket); - control->socket = -1; - return HT_INTERRUPTED; + if (TRACE) + fprintf (stderr, + "HTFTP: Interrupted at beginning of login.\n"); + _HTProgress ("Connection interrupted."); + NETCLOSE(control->socket); + control->socket = -1; + return HT_INTERRUPTED; } server_type = GENERIC_SERVER; /* reset */ if (status == 2) { /* Send username */ @@ -790,26 +790,26 @@ PRIVATE int get_connection ARGS2( if (username && *username) { command = (char*)malloc(10+strlen(username)+2+1); if (command == NULL) - outofmem(__FILE__, "get_connection"); + outofmem(__FILE__, "get_connection"); sprintf(command, "USER %s%c%c", username, CR, LF); } else { command = (char*)malloc(24); if (command == NULL) - outofmem(__FILE__, "get_connection"); + outofmem(__FILE__, "get_connection"); sprintf(command, "USER anonymous%c%c", CR, LF); - } + } status = response(command); FREE(command); - if (status == HT_INTERRUPTED) - { - if (TRACE) - fprintf (stderr, - "HTFTP: Interrupted while sending username.\n"); - _HTProgress ("Connection interrupted."); - NETCLOSE(control->socket); - control->socket = -1; - return HT_INTERRUPTED; - } + if (status == HT_INTERRUPTED) + { + if (TRACE) + fprintf (stderr, + "HTFTP: Interrupted while sending username.\n"); + _HTProgress ("Connection interrupted."); + NETCLOSE(control->socket); + control->socket = -1; + return HT_INTERRUPTED; + } } if (status == 3) { /* Send password */ if (password) { @@ -818,7 +818,7 @@ PRIVATE int get_connection ARGS2( */ command = (char*)malloc(10+strlen(password)+2+1); if (command == NULL) - outofmem(__FILE__, "get_connection"); + outofmem(__FILE__, "get_connection"); sprintf(command, "PASS %s%c%c", password, CR, LF); } else { /* @@ -829,11 +829,11 @@ PRIVATE int get_connection ARGS2( char * cp; if (personal_mail_address && *personal_mail_address) { - /* + /* * We have a non-zero length personal * mail address, so use that. - FM */ - StrAllocCopy(user, personal_mail_address); + StrAllocCopy(user, personal_mail_address); if ((cp=strchr(user, '@')) != NULL) { *cp++ = '\0'; host = cp; @@ -841,7 +841,7 @@ PRIVATE int get_connection ARGS2( host = HTHostName(); } } else { - /* + /* * Use an environment variable and the host global. - FM */ if ((cp=getenv("USER")) != NULL) @@ -856,151 +856,151 @@ PRIVATE int get_connection ARGS2( * as ftp.uu.net prefers a blank to a bad name */ if (!(host) || strchr(host, '.') == NULL) - host = ""; + host = ""; command = (char*)malloc(10+strlen(user)+1+strlen(host)+2+1); if (command == NULL) - outofmem(__FILE__, "get_connection"); + outofmem(__FILE__, "get_connection"); sprintf(command, "PASS %s@%s%c%c", user, host, CR, LF); FREE(user); - } + } status = response(command); FREE(command); - if (status == HT_INTERRUPTED) - { - if (TRACE) - fprintf (stderr, - "HTFTP: Interrupted while sending password.\n"); - _HTProgress ("Connection interrupted."); - NETCLOSE(control->socket); - control->socket = -1; - return HT_INTERRUPTED; - } + if (status == HT_INTERRUPTED) + { + if (TRACE) + fprintf (stderr, + "HTFTP: Interrupted while sending password.\n"); + _HTProgress ("Connection interrupted."); + NETCLOSE(control->socket); + control->socket = -1; + return HT_INTERRUPTED; + } } FREE(username); if (status == 3) { - char temp[80]; + char temp[80]; sprintf(temp, "ACCT noaccount%c%c", CR, LF); status = response(temp); if (status == HT_INTERRUPTED) - { - if (TRACE) - fprintf (stderr, - "HTFTP: Interrupted while sending password.\n"); - _HTProgress ("Connection interrupted."); - NETCLOSE(control->socket); - control->socket = -1; - return HT_INTERRUPTED; - } + { + if (TRACE) + fprintf (stderr, + "HTFTP: Interrupted while sending password.\n"); + _HTProgress ("Connection interrupted."); + NETCLOSE(control->socket); + control->socket = -1; + return HT_INTERRUPTED; + } } if (status != 2) { - if (TRACE) + if (TRACE) fprintf(stderr, "HTFTP: Login fail: %s", response_text); - /* if (control->socket > 0) close_connection(control->socket); */ - return -1; /* Bad return */ + /* if (control->socket > 0) close_connection(control->socket); */ + return -1; /* Bad return */ } if (TRACE) fprintf(stderr, "HTFTP: Logged in.\n"); /** Check for host type **/ if (server_type != NETPRESENZ_SERVER) server_type = GENERIC_SERVER; /* reset */ - use_list = FALSE; /* reset */ + use_list = FALSE; /* reset */ if ((status=response("SYST\r\n")) == 2) { - /* we got a line -- what kind of server are we talking to? */ - if (strncmp(response_text+4, - "UNIX Type: L8 MAC-OS MachTen", 28) == 0) { - server_type = MACHTEN_SERVER; + /* we got a line -- what kind of server are we talking to? */ + if (strncmp(response_text+4, + "UNIX Type: L8 MAC-OS MachTen", 28) == 0) { + server_type = MACHTEN_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as MachTen server.\n"); + fprintf(stderr, "HTFTP: Treating as MachTen server.\n"); - } else if (strstr(response_text+4, "UNIX") != NULL || + } else if (strstr(response_text+4, "UNIX") != NULL || strstr(response_text+4, "Unix") != NULL) { - server_type = UNIX_SERVER; + server_type = UNIX_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as Unix server.\n"); + fprintf(stderr, "HTFTP: Treating as Unix server.\n"); - } else if (strstr(response_text+4, "MSDOS") != NULL) { - server_type = MSDOS_SERVER; + } else if (strstr(response_text+4, "MSDOS") != NULL) { + server_type = MSDOS_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, - "HTFTP: Treating as MSDOS (Unix emulation) server.\n"); + fprintf(stderr, + "HTFTP: Treating as MSDOS (Unix emulation) server.\n"); - } else if (strncmp(response_text+4, "VMS", 3) == 0) { - server_type = VMS_SERVER; + } else if (strncmp(response_text+4, "VMS", 3) == 0) { + server_type = VMS_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as VMS server.\n"); + fprintf(stderr, "HTFTP: Treating as VMS server.\n"); } else if ((strncmp(response_text+4, "VM/CMS", 6) == 0) || - (strncmp(response_text+4, "VM ", 3) == 0)) { - server_type = CMS_SERVER; + (strncmp(response_text+4, "VM ", 3) == 0)) { + server_type = CMS_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as CMS server.\n"); + fprintf(stderr, "HTFTP: Treating as CMS server.\n"); } else if (strncmp(response_text+4, "DCTS", 4) == 0) { - server_type = DCTS_SERVER; + server_type = DCTS_SERVER; if (TRACE) - fprintf(stderr, "HTFTP: Treating as DCTS server.\n"); + fprintf(stderr, "HTFTP: Treating as DCTS server.\n"); } else if (strstr(response_text+4, "MAC-OS TCP/Connect II") != NULL) { - server_type = TCPC_SERVER; + server_type = TCPC_SERVER; if (TRACE) - fprintf(stderr, "HTFTP: Looks like a TCPC server.\n"); - get_ftp_pwd(&server_type, &use_list); + fprintf(stderr, "HTFTP: Looks like a TCPC server.\n"); + get_ftp_pwd(&server_type, &use_list); unsure_type = TRUE; - } else if (server_type == NETPRESENZ_SERVER) { /* already set above */ - use_list = TRUE; - set_mac_binary(server_type); + } else if (server_type == NETPRESENZ_SERVER) { /* already set above */ + use_list = TRUE; + set_mac_binary(server_type); if (TRACE) - fprintf(stderr, - "HTFTP: Treating as NetPresenz (MACOS) server.\n"); + fprintf(stderr, + "HTFTP: Treating as NetPresenz (MACOS) server.\n"); - } else if (strncmp(response_text+4, "MACOS Peter's Server", 20) == 0) { - server_type = PETER_LEWIS_SERVER; - use_list = TRUE; - set_mac_binary(server_type); + } else if (strncmp(response_text+4, "MACOS Peter's Server", 20) == 0) { + server_type = PETER_LEWIS_SERVER; + use_list = TRUE; + set_mac_binary(server_type); if (TRACE) - fprintf(stderr, - "HTFTP: Treating as Peter Lewis (MACOS) server.\n"); + fprintf(stderr, + "HTFTP: Treating as Peter Lewis (MACOS) server.\n"); - } else if (strncmp(response_text+4, "Windows_NT", 10) == 0) { + } else if (strncmp(response_text+4, "Windows_NT", 10) == 0) { server_type = WINDOWS_NT_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as Window_NT server.\n"); + fprintf(stderr, "HTFTP: Treating as Window_NT server.\n"); } else if (strncmp(response_text+4, "MS Windows", 10) == 0) { server_type = MS_WINDOWS_SERVER; use_list = TRUE; if (TRACE) - fprintf(stderr, "HTFTP: Treating as MS Windows server.\n"); + fprintf(stderr, "HTFTP: Treating as MS Windows server.\n"); - } else if (strncmp(response_text+4, + } else if (strncmp(response_text+4, "MACOS AppleShare IP FTP Server", 30) == 0) { - server_type = APPLESHARE_SERVER; - use_list = TRUE; - set_mac_binary(server_type); + server_type = APPLESHARE_SERVER; + use_list = TRUE; + set_mac_binary(server_type); if (TRACE) - fprintf(stderr, - "HTFTP: Treating as AppleShare server.\n"); + fprintf(stderr, + "HTFTP: Treating as AppleShare server.\n"); - } else { + } else { server_type = GENERIC_SERVER; if (TRACE) - fprintf(stderr, "HTFTP: Ugh! A Generic server.\n"); - get_ftp_pwd(&server_type, &use_list); + fprintf(stderr, "HTFTP: Ugh! A Generic server.\n"); + get_ftp_pwd(&server_type, &use_list); unsure_type = TRUE; } } else { /* SYST fails :( try to get the type from the PWD command */ - get_ftp_pwd(&server_type, &use_list); + get_ftp_pwd(&server_type, &use_list); } /* Now we inform the server of the port number we will listen on @@ -1010,14 +1010,14 @@ PRIVATE int get_connection ARGS2( int status = response(port_command); if (status != 2) { if (control->socket) - close_connection(control->socket); + close_connection(control->socket); return -status; /* Bad return */ } if (TRACE) fprintf(stderr, "HTFTP: Port defined.\n"); } #endif /* NOTREPEAT_PORT */ - return con->socket; /* Good return */ + return con->socket; /* Good return */ } @@ -1034,12 +1034,12 @@ PRIVATE int close_master_socket NOARGS FD_CLR(master_socket, &open_sockets); status = NETCLOSE(master_socket); if (TRACE) - fprintf(stderr, "HTFTP: Closed master socket %d\n", master_socket); + fprintf(stderr, "HTFTP: Closed master socket %d\n", master_socket); master_socket = -1; if (status < 0) - return HTInetStatus("close master socket"); + return HTInetStatus("close master socket"); else - return status; + return status; } @@ -1052,7 +1052,7 @@ PRIVATE int close_master_socket NOARGS ** On entry, ** master_socket Must be negative if not set up already. ** On exit, -** Returns socket number if good +** Returns socket number if good ** less than zero if error. ** master_socket is socket number if good, else negative. ** port_number is valid if good. @@ -1069,7 +1069,7 @@ PRIVATE int get_listen_socket NOARGS #ifndef REPEAT_LISTEN if (master_socket >= 0) - return master_socket; /* Done already */ + return master_socket; /* Done already */ #endif /* !REPEAT_LISTEN */ /* Create internet socket @@ -1080,7 +1080,7 @@ PRIVATE int get_listen_socket NOARGS return HTInetStatus("socket for master socket"); if (TRACE) - fprintf(stderr, "HTFTP: Opened master socket number %d\n", new_socket); + fprintf(stderr, "HTFTP: Opened master socket number %d\n", new_socket); /* Search for a free port. */ @@ -1088,7 +1088,7 @@ PRIVATE int get_listen_socket NOARGS soc_in->sin_addr.s_addr = INADDR_ANY; /* Any peer address */ #ifdef POLL_PORTS { - unsigned short old_port_number = port_number; + unsigned short old_port_number = port_number; for (port_number = (old_port_number+1); ; port_number++) { int status; if (port_number > LAST_TCP_PORT) @@ -1099,7 +1099,7 @@ PRIVATE int get_listen_socket NOARGS soc_address.sin_port = htons(port_number); #ifdef SOCKS if (socks_flag) - if ((status=Rbind(new_socket, + if ((status=Rbind(new_socket, (struct sockaddr*)&soc_address, /* Cast to generic sockaddr */ sizeof(soc_address) @@ -1116,20 +1116,20 @@ PRIVATE int get_listen_socket NOARGS sizeof(soc_address))) == 0) break; if (TRACE) - fprintf(stderr, - "TCP bind attempt to port %d yields %d, errno=%d\n", + fprintf(stderr, + "TCP bind attempt to port %d yields %d, errno=%d\n", port_number, status, SOCKET_ERRNO); } /* for */ } #else { - int status; + int status; int address_length = sizeof(soc_address); #ifdef SOCKS if (socks_flag) status = Rgetsockname(control->socket, (struct sockaddr *)&soc_address, - (void *)&address_length); + (void *)&address_length); else #endif /* SOCKS */ status = getsockname(control->socket, @@ -1174,12 +1174,12 @@ PRIVATE int get_listen_socket NOARGS #endif /* POLL_PORTS */ CTRACE(tfp, "HTFTP: bound to port %d on %s\n", - (int)ntohs(soc_in->sin_port), + (int)ntohs(soc_in->sin_port), HTInetString(soc_in)); #ifdef REPEAT_LISTEN if (master_socket >= 0) - (void) close_master_socket(); + (void) close_master_socket(); #endif /* REPEAD_LISTEN */ master_socket = new_socket; @@ -1203,7 +1203,7 @@ PRIVATE int get_listen_socket NOARGS int status; #ifdef SOCKS if (socks_flag) - status = Rlisten(master_socket, 1); + status = Rlisten(master_socket, 1); else #endif /* SOCKS */ status = listen(master_socket, 1); @@ -1215,7 +1215,7 @@ PRIVATE int get_listen_socket NOARGS CTRACE(tfp, "TCP: Master socket(), bind() and listen() all OK\n"); FD_SET(master_socket, &open_sockets); if ((master_socket+1) > num_sockets) - num_sockets = master_socket+1; + num_sockets = master_socket+1; return master_socket; /* Good */ @@ -1246,13 +1246,13 @@ PRIVATE void set_years_and_date NOARGS strncpy(day, (char *)ctime(&NowTime)+8, 2); day[2] = '\0'; if (day[0] == ' ') { - day[0] = '0'; + day[0] = '0'; } strncpy(month, (char *)ctime(&NowTime)+4, 3); strncpy(month, (char *)ctime(&NowTime)+4, 3); month[3] = '\0'; for (i = 0; i < 12; i++) { - if (!strcasecomp(month, months[i])) { + if (!strcasecomp(month, months[i])) { break; } } @@ -1267,38 +1267,38 @@ PRIVATE void set_years_and_date NOARGS } typedef struct _EntryInfo { - char * filename; - char * type; - char * date; + char * filename; + char * type; + char * date; unsigned int size; - BOOLEAN display; /* show this entry? */ + BOOLEAN display; /* show this entry? */ } EntryInfo; PRIVATE void free_entryinfo_struct_contents ARGS1( EntryInfo *, entry_info) { if (entry_info) { - FREE(entry_info->filename); - FREE(entry_info->type); - FREE(entry_info->date); + FREE(entry_info->filename); + FREE(entry_info->type); + FREE(entry_info->date); } /* dont free the struct */ } /* * is_ls_date() -- - * Return TRUE if s points to a string of the form: - * "Sep 1 1990 " or - * "Sep 11 11:59 " or - * "Dec 12 1989 " or - * "FCv 23 1990 " ... + * Return TRUE if s points to a string of the form: + * "Sep 1 1990 " or + * "Sep 11 11:59 " or + * "Dec 12 1989 " or + * "FCv 23 1990 " ... */ PRIVATE BOOLEAN is_ls_date ARGS1( - char *, s) + char *, s) { /* must start with three alpha characters */ if (!isalpha(*s++) || !isalpha(*s++) || !isalpha(*s++)) - return FALSE; + return FALSE; /* space or HT_NON_BREAK_SPACE */ if (!(*s == ' ' || *s == HT_NON_BREAK_SPACE)) { @@ -1316,11 +1316,11 @@ PRIVATE BOOLEAN is_ls_date ARGS1( /* digit */ if (!isdigit(*s++)) - return FALSE; + return FALSE; /* space */ if (*s++ != ' ') - return FALSE; + return FALSE; /* space or digit */ if (!(*s == ' ' || isdigit(*s))) { @@ -1331,7 +1331,7 @@ PRIVATE BOOLEAN is_ls_date ARGS1( /* digit */ if (!isdigit(*s++)) - return FALSE; + return FALSE; /* colon or digit */ if (!(*s == ':' || isdigit(*s))) { @@ -1342,7 +1342,7 @@ PRIVATE BOOLEAN is_ls_date ARGS1( /* digit */ if (!isdigit(*s++)) - return FALSE; + return FALSE; /* space or digit */ if (!(*s == ' ' || isdigit(*s))) { @@ -1353,17 +1353,17 @@ PRIVATE BOOLEAN is_ls_date ARGS1( /* space */ if (*s++ != ' ') - return FALSE; + return FALSE; return TRUE; } /* is_ls_date() */ /* * parse_eplf_line() -- - * Extract the name, size, and date from an EPLF line. - 08-06-96 DJB + * Extract the name, size, and date from an EPLF line. - 08-06-96 DJB */ PRIVATE void parse_eplf_line ARGS2( - char *, line, + char *, line, EntryInfo *, info) { char *cp = line; @@ -1383,12 +1383,12 @@ PRIVATE void parse_eplf_line ARGS2( } while (*cp) { - switch(*cp) { + switch(*cp) { case '\t': - StrAllocCopy(info->filename, cp + 1); + StrAllocCopy(info->filename, cp + 1); return; case 's': - size = 0; + size = 0; while (*(++cp) && (*cp != ',')) size = (size * 10) + (*cp - '0'); info->size = size; @@ -1416,10 +1416,10 @@ PRIVATE void parse_eplf_line ARGS2( /* * parse_ls_line() -- - * Extract the name, size, and date from an ls -l line. + * Extract the name, size, and date from an ls -l line. */ PRIVATE void parse_ls_line ARGS2( - char *, line, + char *, line, EntryInfo *, entry_info) { short i, j; @@ -1427,26 +1427,26 @@ PRIVATE void parse_ls_line ARGS2( int size_num=0; for (i = strlen(line) - 1; - (i > 13) && (!isspace(line[i]) || !is_ls_date(&line[i-12])); i--) - ; /* null body */ + (i > 13) && (!isspace(line[i]) || !is_ls_date(&line[i-12])); i--) + ; /* null body */ line[i] = '\0'; if (i > 13) { - StrAllocCopy(entry_info->date, &line[i-12]); + StrAllocCopy(entry_info->date, &line[i-12]); /* replace the 4th location with nbsp if it is a space or zero */ if (entry_info->date[4] == ' ' || entry_info->date[4] == '0') entry_info->date[4] = HT_NON_BREAK_SPACE; /* make sure year or time is flush right */ if (entry_info->date[11] == ' ') { for (j = 11; j > 6; j--) { - entry_info->date[j] = entry_info->date[j-1]; + entry_info->date[j] = entry_info->date[j-1]; } } } j = i - 14; while (isdigit(line[j])) { - size_num += (line[j] - '0') * base; - base *= 10; - j--; + size_num += (line[j] - '0') * base; + base *= 10; + j--; } entry_info->size = size_num; StrAllocCopy(entry_info->filename, &line[i + 1]); @@ -1454,11 +1454,11 @@ PRIVATE void parse_ls_line ARGS2( /* * parse_vms_dir_entry() - * Format the name, date, and size from a VMS LIST line - * into the EntryInfo structure - FM + * Format the name, date, and size from a VMS LIST line + * into the EntryInfo structure - FM */ PRIVATE void parse_vms_dir_entry ARGS2( - char *, line, + char *, line, EntryInfo *, entry_info) { int i, j, ialloc; @@ -1467,8 +1467,8 @@ PRIVATE void parse_vms_dir_entry ARGS2( /** Get rid of blank lines, and information lines. **/ /** Valid lines have the ';' version number token. **/ if (!strlen(line) || (cp=strchr(line, ';')) == NULL) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } /** Cut out file or directory name at VMS version number. **/ @@ -1477,61 +1477,61 @@ PRIVATE void parse_vms_dir_entry ARGS2( /** Cast VMS non-README file and directory names to lowercase. **/ if (strstr(entry_info->filename, "READ") == NULL) { - for (i = 0; entry_info->filename[i]; i++) + for (i = 0; entry_info->filename[i]; i++) entry_info->filename[i] = TOLOWER(entry_info->filename[i]); } else { - i = ((strstr(entry_info->filename, "READ") - entry_info->filename) + 4); + i = ((strstr(entry_info->filename, "READ") - entry_info->filename) + 4); if (!strncmp((char *)&entry_info->filename[i], "ME", 2)) { i += 2; while (entry_info->filename[i] && entry_info->filename[i] != '.') { - i++; + i++; } } else if (!strncmp((char *)&entry_info->filename[i], ".ME", 3)) { i = strlen(entry_info->filename); } else { i = 0; } - for (; entry_info->filename[i]; i++) + for (; entry_info->filename[i]; i++) entry_info->filename[i] = TOLOWER(entry_info->filename[i]); } /** Uppercase terminal .z's or _z's. **/ if ((--i > 2) && - entry_info->filename[i] == 'z' && - (entry_info->filename[i-1] == '.' || - entry_info->filename[i-1] == '_')) - entry_info->filename[i] = 'Z'; + entry_info->filename[i] == 'z' && + (entry_info->filename[i-1] == '.' || + entry_info->filename[i-1] == '_')) + entry_info->filename[i] = 'Z'; /** Convert any tabs in rest of line to spaces. **/ cps = cp-1; while ((cps=strchr(cps+1, '\t')) != NULL) - *cps = ' '; + *cps = ' '; /** Collapse serial spaces. **/ i = 0; j = 1; cps = cp; while (cps[j] != '\0') { - if (cps[i] == ' ' && cps[j] == ' ') - j++; - else - cps[++i] = cps[j++]; + if (cps[i] == ' ' && cps[j] == ' ') + j++; + else + cps[++i] = cps[j++]; } cps[++i] = '\0'; /* Set the years and date, if we don't have them yet. **/ if (!HaveYears) { - set_years_and_date(); + set_years_and_date(); } /** Track down the date. **/ if ((cpd=strchr(cp, '-')) != NULL && - strlen(cpd) > 9 && isdigit(*(cpd-1)) && - isalpha(*(cpd+1)) && *(cpd+4) == '-') { + strlen(cpd) > 9 && isdigit(*(cpd-1)) && + isalpha(*(cpd+1)) && *(cpd+4) == '-') { - /** Month **/ - *(cpd+4) = '\0'; - *(cpd+2) = TOLOWER(*(cpd+2)); - *(cpd+3) = TOLOWER(*(cpd+3)); + /** Month **/ + *(cpd+4) = '\0'; + *(cpd+2) = TOLOWER(*(cpd+2)); + *(cpd+3) = TOLOWER(*(cpd+3)); sprintf(date, "%s ", cpd+1); *(cpd+4) = '-'; @@ -1555,39 +1555,39 @@ PRIVATE void parse_vms_dir_entry ARGS2( *(cpd+9) = ' '; } - StrAllocCopy(entry_info->date, date); + StrAllocCopy(entry_info->date, date); } /** Track down the size **/ if ((cpd=strchr(cp, '/')) != NULL) { - /* Appears be in used/allocated format */ - cps = cpd; - while (isdigit(*(cps-1))) - cps--; - if (cps < cpd) - *cpd = '\0'; - entry_info->size = atoi(cps); - cps = cpd+1; - while (isdigit(*cps)) - cps++; - *cps = '\0'; - ialloc = atoi(cpd+1); - /* Check if used is in blocks or bytes */ - if (entry_info->size <= ialloc) - entry_info->size *= 512; + /* Appears be in used/allocated format */ + cps = cpd; + while (isdigit(*(cps-1))) + cps--; + if (cps < cpd) + *cpd = '\0'; + entry_info->size = atoi(cps); + cps = cpd+1; + while (isdigit(*cps)) + cps++; + *cps = '\0'; + ialloc = atoi(cpd+1); + /* Check if used is in blocks or bytes */ + if (entry_info->size <= ialloc) + entry_info->size *= 512; } else if ((cps=strtok(cp, sp)) != NULL) { - /* We just initialized on the version number */ - /* Now let's hunt for a lone, size number */ - while ((cps=strtok(NULL, sp)) != NULL) { - cpd = cps; - while (isdigit(*cpd)) - cpd++; - if (*cpd == '\0') { - /* Assume it's blocks */ - entry_info->size = atoi(cps) * 512; - break; - } + /* We just initialized on the version number */ + /* Now let's hunt for a lone, size number */ + while ((cps=strtok(NULL, sp)) != NULL) { + cpd = cps; + while (isdigit(*cpd)) + cpd++; + if (*cpd == '\0') { + /* Assume it's blocks */ + entry_info->size = atoi(cps) * 512; + break; + } } } @@ -1602,11 +1602,11 @@ PRIVATE void parse_vms_dir_entry ARGS2( /* * parse_ms_windows_dir_entry() -- - * Format the name, date, and size from an MS_WINDOWS LIST line into - * the EntryInfo structure (assumes Chameleon NEWT format). - FM + * Format the name, date, and size from an MS_WINDOWS LIST line into + * the EntryInfo structure (assumes Chameleon NEWT format). - FM */ PRIVATE void parse_ms_windows_dir_entry ARGS2( - char *, line, + char *, line, EntryInfo *, entry_info) { char *cp = line; @@ -1617,8 +1617,8 @@ PRIVATE void parse_ms_windows_dir_entry ARGS2( while (*cp && isspace(*cp)) cp++; if (!(*cp)) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } /** Cut out file or directory name. **/ @@ -1654,18 +1654,18 @@ PRIVATE void parse_ms_windows_dir_entry ARGS2( /** Track down the date. **/ if (cpd < end) { while (*cpd && isspace(*cpd)) - cpd++; + cpd++; if (strlen(cpd) > 17) { *(cpd+6) = '\0'; /* Month and Day */ *(cpd+11) = '\0'; /* Year */ *(cpd+17) = '\0'; /* Time */ if (strcmp(ThisYear, cpd+7)) - /* Not this year, so show the year */ - sprintf(date, "%s %s", cpd, (cpd+7)); + /* Not this year, so show the year */ + sprintf(date, "%s %s", cpd, (cpd+7)); else - /* Is this year, so show the time */ - sprintf(date, "%s %s", cpd, (cpd+12)); - StrAllocCopy(entry_info->date, date); + /* Is this year, so show the time */ + sprintf(date, "%s %s", cpd, (cpd+12)); + StrAllocCopy(entry_info->date, date); if (entry_info->date[4] == ' '|| entry_info->date[4] == '0') { entry_info->date[4] = HT_NON_BREAK_SPACE; } @@ -1683,12 +1683,12 @@ PRIVATE void parse_ms_windows_dir_entry ARGS2( /* * parse_windows_nt_dir_entry() -- - * Format the name, date, and size from a WINDOWS_NT LIST line into - * the EntryInfo structure (assumes Chameleon NEWT format). - FM + * Format the name, date, and size from a WINDOWS_NT LIST line into + * the EntryInfo structure (assumes Chameleon NEWT format). - FM */ #ifdef NOTDEFINED PRIVATE void parse_windows_nt_dir_entry ARGS2( - char *, line, + char *, line, EntryInfo *, entry_info) { char *cp = line; @@ -1700,8 +1700,8 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( while (*cp && isspace(*cp)) cp++; if (!(*cp)) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } /** Cut out file or directory name. **/ @@ -1711,8 +1711,8 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( cps--; cp = (cps+1); if (!strcmp(cp, ".") || !strcmp(cp, "..")) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } StrAllocCopy(entry_info->filename, cp); if (cps < cpd) @@ -1731,8 +1731,8 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( cps++; *cps++ ='\0'; if (cps > end) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } while (*cps && isspace(*cps)) cps++; @@ -1741,15 +1741,15 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( cps++; *cps++ ='\0'; if (cps > end || cpd == cps || strlen(cpd) < 7) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } if (strlen(cp) == 8 && isdigit(*cp) && isdigit(*(cp+1)) && *(cp+2) == '-' && isdigit(*(cp+3)) && isdigit(*(cp+4)) && *(cp+5) == '-') { *(cp+2) = '\0'; /* Month */ i = atoi(cp) - 1; - *(cp+5) = '\0'; /* Day */ + *(cp+5) = '\0'; /* Day */ sprintf(date, "%s %s", months[i], (cp+3)); if (date[4] == '0') date[4] = ' '; @@ -1771,7 +1771,7 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( sprintf((char*)&date[6], " %s%d:%s", (i < 10 ? "0" : ""), i, (cpd+3)); } - StrAllocCopy(entry_info->date, date); + StrAllocCopy(entry_info->date, date); if (entry_info->date[4] == ' '|| entry_info->date[4] == '0') { entry_info->date[4] = HT_NON_BREAK_SPACE; } @@ -1806,11 +1806,11 @@ PRIVATE void parse_windows_nt_dir_entry ARGS2( /* * parse_cms_dir_entry() -- - * Format the name, date, and size from a VM/CMS line into - * the EntryInfo structure. - FM + * Format the name, date, and size from a VM/CMS line into + * the EntryInfo structure. - FM */ PRIVATE void parse_cms_dir_entry ARGS2( - char *, line, + char *, line, EntryInfo *, entry_info) { char *cp = line; @@ -1824,8 +1824,8 @@ PRIVATE void parse_cms_dir_entry ARGS2( while (*cp && isspace(*cp)) cp++; if (!(*cp)) { - entry_info->display = FALSE; - return; + entry_info->display = FALSE; + return; } /** Cut out file or directory name. **/ @@ -1836,39 +1836,39 @@ PRIVATE void parse_cms_dir_entry ARGS2( StrAllocCopy(entry_info->filename, cp); if (strchr(entry_info->filename, '.') != NULL) /** If we already have a dot, we did an NLST. **/ - return; + return; cp = cps; while (*cp && isspace(*cp)) cp++; if (!(*cp)) { - /** If we don't have more, we've misparsed. **/ - FREE(entry_info->filename); - FREE(entry_info->type); - entry_info->display = FALSE; - return; + /** If we don't have more, we've misparsed. **/ + FREE(entry_info->filename); + FREE(entry_info->type); + entry_info->display = FALSE; + return; } cps = cp; while (*cps && !isspace(*cps)) cps++; *cps++ ='\0'; if ((0 == strcasecomp(cp, "DIR")) && (cp - line) > 17) { - /** It's an SFS directory. **/ - StrAllocCopy(entry_info->type, "Directory"); - entry_info->size = 0; + /** It's an SFS directory. **/ + StrAllocCopy(entry_info->type, "Directory"); + entry_info->size = 0; } else { - /** It's a file. **/ - cp--; + /** It's a file. **/ + cp--; *cp = '.'; StrAllocCat(entry_info->filename, cp); - /** Track down the VM/CMS RECFM or type. **/ + /** Track down the VM/CMS RECFM or type. **/ cp = cps; if (cp < end) { while (*cp && isspace(*cp)) - cp++; + cp++; cps = cp; while (*cps && !isspace(*cps)) - cps++; + cps++; *cps++ = '\0'; /** Check cp here, if it's relevant someday. **/ } @@ -1914,8 +1914,8 @@ PRIVATE void parse_cms_dir_entry ARGS2( /** Track down the date. **/ cpd = cps; if (((cps < end) && - (cps = strchr(cpd, ':')) != NULL) && - (cps < (end - 3) && + (cps = strchr(cpd, ':')) != NULL) && + (cps < (end - 3) && isdigit(*(cps+1)) && isdigit(*(cps+2)) && *(cps+3) == ':')) { cps += 3; *cps = '\0'; @@ -1933,14 +1933,14 @@ PRIVATE void parse_cms_dir_entry ARGS2( date[4] = ' '; cpd += 6; /* Year */ if (strcmp((ThisYear+2), cpd)) { - /* Not this year, so show the year. */ + /* Not this year, so show the year. */ if (atoi(cpd) < 70) { sprintf((char *)&date[6], " 20%s", cpd); } else { sprintf((char *)&date[6], " 19%s", cpd); } } else { - /* Is this year, so show the time. */ + /* Is this year, so show the time. */ *(cps+2) = '\0'; /* Hour */ i = atoi(cps); sprintf((char*)&date[6], " %s%d:%s", @@ -1964,14 +1964,14 @@ PRIVATE void parse_cms_dir_entry ARGS2( /* * parse_dir_entry() - * Given a line of LIST/NLST output in entry, return results - * and a file/dir name in entry_info struct + * Given a line of LIST/NLST output in entry, return results + * and a file/dir name in entry_info struct * - * If first is true, this is the first name in a directory. + * If first is true, this is the first name in a directory. */ PRIVATE EntryInfo * parse_dir_entry ARGS2( - char *, entry, + char *, entry, BOOLEAN *, first) { EntryInfo *entry_info; @@ -1988,125 +1988,125 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( entry_info->display = TRUE; switch (server_type) { - case UNIX_SERVER: - case PETER_LEWIS_SERVER: - case MACHTEN_SERVER: + case UNIX_SERVER: + case PETER_LEWIS_SERVER: + case MACHTEN_SERVER: case MSDOS_SERVER: - case WINDOWS_NT_SERVER: - case APPLESHARE_SERVER: - case NETPRESENZ_SERVER: + case WINDOWS_NT_SERVER: + case APPLESHARE_SERVER: + case NETPRESENZ_SERVER: /* - ** Check for EPLF output (local times). + ** Check for EPLF output (local times). */ if (*entry == '+') { parse_eplf_line(entry, entry_info); break; } - /* - ** Interpret and edit LIST output from Unix server. + /* + ** Interpret and edit LIST output from Unix server. */ - len = strlen(entry); + len = strlen(entry); if (*first) { if (!strcmp(entry, "can not access directory .")) { /* - * Don't reset *first, nothing real will follow. - KW + * Don't reset *first, nothing real will follow. - KW */ entry_info->display = FALSE; return(entry_info); } - *first = FALSE; - if (!strncmp(entry, "total ", 6) || - strstr(entry, "not available") != NULL) { + *first = FALSE; + if (!strncmp(entry, "total ", 6) || + strstr(entry, "not available") != NULL) { entry_info->display=FALSE; return(entry_info); } else if (unsure_type) { - /* this isn't really a unix server! */ - server_type = GENERIC_SERVER; + /* this isn't really a unix server! */ + server_type = GENERIC_SERVER; entry_info->display=FALSE; return(entry_info); } } - /* - ** Check first character of ls -l output. + /* + ** Check first character of ls -l output. */ - if (TOUPPER(entry[0]) == 'D') { - /* + if (TOUPPER(entry[0]) == 'D') { + /* ** It's a directory. */ - StrAllocCopy(entry_info->type, "Directory"); - remove_size=TRUE; /* size is not useful */ + StrAllocCopy(entry_info->type, "Directory"); + remove_size=TRUE; /* size is not useful */ } else if (entry[0] == 'l') { - /* + /* ** It's a symbolic link, does the user care about - ** knowing if it is symbolic? I think so since + ** knowing if it is symbolic? I think so since ** it might be a directory. */ - StrAllocCopy(entry_info->type, "Symbolic Link"); + StrAllocCopy(entry_info->type, "Symbolic Link"); remove_size=TRUE; /* size is not useful */ - /* + /* ** Strip off " -> pathname". */ - for (i = len - 1; (i > 3) && - (!isspace(entry[i]) || - (entry[i-1] != '>') || + for (i = len - 1; (i > 3) && + (!isspace(entry[i]) || + (entry[i-1] != '>') || (entry[i-2] != '-') || (entry[i-3] != ' ')); i--) - ; /* null body */ - if (i > 3) { - entry[i-3] = '\0'; - len = i - 3; - } - } /* link */ + ; /* null body */ + if (i > 3) { + entry[i-3] = '\0'; + len = i - 3; + } + } /* link */ parse_ls_line(entry, entry_info); if (!strcmp(entry_info->filename,"..") || - !strcmp(entry_info->filename,".")) + !strcmp(entry_info->filename,".")) entry_info->display=FALSE; /* - ** Goto the bottom and get real type. + ** Goto the bottom and get real type. */ - break; + break; - case VMS_SERVER: - /* - ** Interpret and edit LIST output from VMS server - ** and convert information lines to zero length. + case VMS_SERVER: + /* + ** Interpret and edit LIST output from VMS server + ** and convert information lines to zero length. */ parse_vms_dir_entry(entry, entry_info); - /* - ** Get rid of any junk lines. + /* + ** Get rid of any junk lines. */ if (!entry_info->display) return(entry_info); /* - ** Trim off VMS directory extensions. + ** Trim off VMS directory extensions. */ len = strlen(entry_info->filename); - if ((len > 4) && !strcmp(&entry_info->filename[len-4], ".dir")) { + if ((len > 4) && !strcmp(&entry_info->filename[len-4], ".dir")) { entry_info->filename[len-4] = '\0'; - StrAllocCopy(entry_info->type, "Directory"); + StrAllocCopy(entry_info->type, "Directory"); remove_size=TRUE; /* size is not useful */ } /* - ** Goto the bottom and get real type. + ** Goto the bottom and get real type. */ - break; + break; - case MS_WINDOWS_SERVER: - /* - ** Interpret and edit LIST output from MS_WINDOWS server - ** and convert information lines to zero length. + case MS_WINDOWS_SERVER: + /* + ** Interpret and edit LIST output from MS_WINDOWS server + ** and convert information lines to zero length. */ parse_ms_windows_dir_entry(entry, entry_info); - /* - ** Get rid of any junk lines. + /* + ** Get rid of any junk lines. */ if (!entry_info->display) return(entry_info); @@ -2115,20 +2115,20 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( return(entry_info); } /* - ** Goto the bottom and get real type. + ** Goto the bottom and get real type. */ break; #ifdef NOTDEFINED - case WINDOWS_NT_SERVER: - /* - ** Interpret and edit LIST output from MS_WINDOWS server - ** and convert information lines to zero length. + case WINDOWS_NT_SERVER: + /* + ** Interpret and edit LIST output from MS_WINDOWS server + ** and convert information lines to zero length. */ parse_windows_nt_dir_entry(entry, entry_info); - /* - ** Get rid of any junk lines. + /* + ** Get rid of any junk lines. */ if (!entry_info->display) return(entry_info); @@ -2137,21 +2137,21 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( return(entry_info); } /* - ** Goto the bottom and get real type. + ** Goto the bottom and get real type. */ break; #endif /* NOTDEFINED */ - case CMS_SERVER: + case CMS_SERVER: { - /* - ** Interpret and edit LIST output from VM/CMS server - ** and convert any information lines to zero length. + /* + ** Interpret and edit LIST output from VM/CMS server + ** and convert any information lines to zero length. */ parse_cms_dir_entry(entry, entry_info); - /* - ** Get rid of any junk lines. + /* + ** Get rid of any junk lines. */ if (!entry_info->display) return(entry_info); @@ -2160,35 +2160,35 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( return(entry_info); } /* - ** Goto the bottom and get real type. + ** Goto the bottom and get real type. */ break; } - case NCSA_SERVER: - case TCPC_SERVER: - /* - ** Directories identified by trailing "/" characters. + case NCSA_SERVER: + case TCPC_SERVER: + /* + ** Directories identified by trailing "/" characters. */ StrAllocCopy(entry_info->filename, entry); - len = strlen(entry); - if (entry[len-1] == '/') { - /* + len = strlen(entry); + if (entry[len-1] == '/') { + /* ** It's a dir, remove / and mark it as such. */ - entry[len-1] = '\0'; - StrAllocCopy(entry_info->type, "Directory"); + entry[len-1] = '\0'; + StrAllocCopy(entry_info->type, "Directory"); remove_size=TRUE; /* size is not useful */ - } + } /* - ** Goto the bottom and get real type. + ** Goto the bottom and get real type. */ - break; + break; default: /* - ** We can't tell if it is a directory since we only - ** did an NLST :( List bad file types anyways? NOT! + ** We can't tell if it is a directory since we only + ** did an NLST :( List bad file types anyways? NOT! */ StrAllocCopy(entry_info->filename, entry); return(entry_info); /* mostly empty info */ @@ -2205,9 +2205,9 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( 0 == strncasecomp(cp, ".me", 3)) && (cp[3] == '\0' || cp[3] == ';')) { /* - ** Don't treat this as application/x-Troff-me - ** if it's a Unix server but has the string - ** "read.me", or if it's not a Unix server. - FM + ** Don't treat this as application/x-Troff-me + ** if it's a Unix server but has the string + ** "read.me", or if it's not a Unix server. - FM */ if ((server_type != UNIX_SERVER) || (cp > (entry_info->filename + 3) && @@ -2218,13 +2218,13 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( } /* - ** Get real types eventually. + ** Get real types eventually. */ if (!entry_info->type) { CONST char *cp2; - HTFormat format; - HTAtom * encoding; /* @@ not used at all */ - format = HTFileFormat(entry_info->filename, &encoding, &cp2); + HTFormat format; + HTAtom * encoding; /* @@ not used at all */ + format = HTFileFormat(entry_info->filename, &encoding, &cp2); if (cp2 == NULL) { if (!strncmp(HTAtom_name(format), "application",11)) { @@ -2236,7 +2236,7 @@ PRIVATE EntryInfo * parse_dir_entry ARGS2( } } - StrAllocCopy(entry_info->type, cp2); + StrAllocCopy(entry_info->type, cp2); } return(entry_info); @@ -2250,29 +2250,29 @@ PRIVATE int compare_EntryInfo_structs ARGS2( char date1[16], date2[16], time1[8], time2[8], month[4]; switch(HTfileSortMethod) { - case FILE_BY_SIZE: + case FILE_BY_SIZE: /* both equal or both 0 */ - if (entry1->size == entry2->size) + if (entry1->size == entry2->size) return(strcmp(entry1->filename, entry2->filename)); else if (entry1->size > entry2->size) return(1); else return(-1); - break; + break; - case FILE_BY_TYPE: - if (entry1->type && entry2->type) { - status = strcasecomp(entry1->type, entry2->type); + case FILE_BY_TYPE: + if (entry1->type && entry2->type) { + status = strcasecomp(entry1->type, entry2->type); if (status) return(status); /* else fall to filename comparison */ } - return (strcmp(entry1->filename, entry2->filename)); - break; + return (strcmp(entry1->filename, entry2->filename)); + break; - case FILE_BY_DATE: - if (entry1->date && entry2->date) { + case FILE_BY_DATE: + if (entry1->date && entry2->date) { /* ** Make sure we have the correct length. - FM */ @@ -2304,9 +2304,9 @@ PRIVATE int compare_EntryInfo_structs ARGS2( month[3] = '\0'; for (i = 0; i < 12; i++) { if (!strcasecomp(month, months[i])) { - break; + break; } - } + } i++; sprintf(month, "%s%d", (i < 10 ? "0" : ""), i); strcat(date1, month); @@ -2322,20 +2322,20 @@ PRIVATE int compare_EntryInfo_structs ARGS2( } strcat(date1, time1); if (entry2->date[9] == ':') { - strcpy(date2, "9999"); + strcpy(date2, "9999"); strcpy(time2, (char *)&entry2->date[7]); if (time2[0] == ' ') { time2[0] = '0'; } } else { strcpy(date2, (char *)&entry2->date[8]); - strcpy(time2, "00:00"); + strcpy(time2, "00:00"); } strncpy(month, entry2->date, 3); month[3] = '\0'; for (i = 0; i < 12; i++) { if (!strcasecomp(month, months[i])) { - break; + break; } } i++; @@ -2355,17 +2355,17 @@ PRIVATE int compare_EntryInfo_structs ARGS2( /* ** Do the comparison. - FM */ - status = strcasecomp(date2, date1); + status = strcasecomp(date2, date1); if (status) return(status); /* else fall to filename comparison */ } - return (strcmp(entry1->filename, entry2->filename)); - break; + return (strcmp(entry1->filename, entry2->filename)); + break; - case FILE_BY_NAME: - default: - return (strcmp(entry1->filename, entry2->filename)); + case FILE_BY_NAME: + default: + return (strcmp(entry1->filename, entry2->filename)); } } @@ -2375,9 +2375,9 @@ PRIVATE int compare_EntryInfo_structs ARGS2( ** ** On entry, ** anchor Parent anchor to link the this node to -** address Address of the directory +** address Address of the directory ** On exit, -** returns HT_LOADED if OK +** returns HT_LOADED if OK ** <0 if error. */ PRIVATE int read_directory ARGS4( @@ -2403,29 +2403,29 @@ PRIVATE int read_directory ARGS4( _HTProgress ("Receiving FTP directory."); /* - ** Check whether we always want the home - ** directory treated as Welcome. - FM + ** Check whether we always want the home + ** directory treated as Welcome. - FM */ if (server_type == VMS_SERVER) - tildeIsTop = TRUE; + tildeIsTop = TRUE; /* - ** This should always come back FALSE, since the - ** flag is set only for local directory listings - ** if LONG_LIST was defined on compilation, but - ** we could someday set up an equivalent listing - ** for Unix ftp servers. - FM + ** This should always come back FALSE, since the + ** flag is set only for local directory listings + ** if LONG_LIST was defined on compilation, but + ** we could someday set up an equivalent listing + ** for Unix ftp servers. - FM */ need_parent_link = HTDirTitles(target, (HTAnchor*)parent, tildeIsTop); data_read_pointer = data_write_pointer = data_buffer; if (*filename == '\0') { /* Empty filename: use root. */ - StrAllocCopy (lastpath, "/"); - } else if (!strcmp(filename,"/")) { /* Root path. */ - StrAllocCopy (lastpath, "/foo/.."); + StrAllocCopy (lastpath, "/"); + } else if (!strcmp(filename,"/")) { /* Root path. */ + StrAllocCopy (lastpath, "/foo/.."); } else { - char * p = strrchr(filename, '/'); /* Find the lastslash. */ + char * p = strrchr(filename, '/'); /* Find the lastslash. */ char *cp; if (server_type == CMS_SERVER) { @@ -2435,7 +2435,7 @@ PRIVATE int read_directory ARGS4( } if ((cp = strrchr(lastpath, ';')) != NULL) { /* Trim type= param. */ if (!strncasecomp((cp+1), "type=", 5)) { - if (TOUPPER(*(cp+6)) == 'D' || + if (TOUPPER(*(cp+6)) == 'D' || TOUPPER(*(cp+6)) == 'A' || TOUPPER(*(cp+6)) == 'I') *cp = '\0'; @@ -2446,20 +2446,20 @@ PRIVATE int read_directory ARGS4( { - HTBTree * bt = HTBTree_new((HTComparer)compare_EntryInfo_structs); - char c; + HTBTree * bt = HTBTree_new((HTComparer)compare_EntryInfo_structs); + char c; HTChunk * chunk = HTChunkCreate(128); int BytesReceived = 0; int BytesReported = 0; char NumBytes[64]; PUTS("\n"); /* prettier LJM */ - for (c = 0; c != (char)EOF;) { /* For each entry in the directory */ + for (c = 0; c != (char)EOF;) { /* For each entry in the directory */ HTChunkClear(chunk); if (HTCheckForInterrupt()) { - WasInterrupted = TRUE; + WasInterrupted = TRUE; if (BytesReceived) { - goto unload_btree; /* unload btree */ + goto unload_btree; /* unload btree */ } else { ABORT_TARGET; HTBTreeAndObject_free(bt); @@ -2467,80 +2467,80 @@ PRIVATE int read_directory ARGS4( } } - /* read directory entry + /* read directory entry */ - for (;;) { /* Read in one line as filename */ + for (;;) { /* Read in one line as filename */ c = NEXT_DATA_CHAR; AgainForMultiNet: if (interrupted_in_next_data_char) { - WasInterrupted = TRUE; + WasInterrupted = TRUE; if (BytesReceived) { - goto unload_btree; /* unload btree */ - } else { - ABORT_TARGET; - HTBTreeAndObject_free(bt); - return HT_INTERRUPTED; - } + goto unload_btree; /* unload btree */ + } else { + ABORT_TARGET; + HTBTreeAndObject_free(bt); + return HT_INTERRUPTED; + } } else if (c == CR || c == LF) { /* Terminator? */ if (chunk->size != 0) { /* got some text */ - /* Deal with MultiNet's wrapping of long lines */ - if (server_type == VMS_SERVER) { - /* Deal with MultiNet's wrapping of long lines - F.M. */ - if (data_read_pointer < data_write_pointer && - *(data_read_pointer+1) == ' ') - data_read_pointer++; - else if (data_read_pointer >= data_write_pointer) { - status = NETREAD(data_soc, data_buffer, - DATA_BUFFER_SIZE); - if (status == HT_INTERRUPTED) { - interrupted_in_next_data_char = 1; - goto AgainForMultiNet; - } - if (status <= 0) { - c = (char)EOF; - break; - } - data_write_pointer = data_buffer + status; - data_read_pointer = data_buffer; - if (*data_read_pointer == ' ') - data_read_pointer++; - else - break; - } - else - break; - } + /* Deal with MultiNet's wrapping of long lines */ + if (server_type == VMS_SERVER) { + /* Deal with MultiNet's wrapping of long lines - F.M. */ + if (data_read_pointer < data_write_pointer && + *(data_read_pointer+1) == ' ') + data_read_pointer++; + else if (data_read_pointer >= data_write_pointer) { + status = NETREAD(data_soc, data_buffer, + DATA_BUFFER_SIZE); + if (status == HT_INTERRUPTED) { + interrupted_in_next_data_char = 1; + goto AgainForMultiNet; + } + if (status <= 0) { + c = (char)EOF; + break; + } + data_write_pointer = data_buffer + status; + data_read_pointer = data_buffer; + if (*data_read_pointer == ' ') + data_read_pointer++; + else + break; + } + else + break; + } else - break; /* finish getting one entry */ + break; /* finish getting one entry */ } } else if (c == (char)EOF) { - break; /* End of file */ + break; /* End of file */ } else { HTChunkPutc(chunk, c); } - } + } HTChunkTerminate(chunk); BytesReceived += chunk->size; if (BytesReceived > BytesReported + 1024) { - sprintf(NumBytes,"Transferred %d bytes",BytesReceived); + sprintf(NumBytes,"Transferred %d bytes",BytesReceived); HTProgress(NumBytes); BytesReported = BytesReceived; } if (c == (char) EOF && chunk->size == 1) /* 1 means empty: includes terminating 0 */ - break; - if (TRACE) - fprintf(stderr, "HTFTP: Line in %s is %s\n", - lastpath, chunk->data); + break; + if (TRACE) + fprintf(stderr, "HTFTP: Line in %s is %s\n", + lastpath, chunk->data); entry_info = parse_dir_entry(chunk->data, &first); if (entry_info->display) { if (TRACE) fprintf(stderr, "Adding file to BTree: %s\n", - entry_info->filename); - HTBTree_add(bt, (EntryInfo *)entry_info); + entry_info->filename); + HTBTree_add(bt, (EntryInfo *)entry_info); } else { FREE(entry_info); } @@ -2549,15 +2549,17 @@ AgainForMultiNet: unload_btree: - HTChunkFree(chunk); + HTChunkFree(chunk); /* print out the handy help message if it exits :) */ if (help_message_cache_non_empty()) { START(HTML_PRE); START(HTML_HR); + PUTS("\n"); PUTS(help_message_cache_contents()); - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ START(HTML_HR); + PUTS("\n"); } else { START(HTML_PRE); PUTS("\n"); @@ -2565,7 +2567,7 @@ unload_btree: /* Put up header */ - /* PUTS(" Date Type Size Filename\n"); + /* PUTS(" Date Type Size Filename\n"); */ /* Run through tree printing out in order @@ -2587,9 +2589,9 @@ unload_btree: if (entry_info->type) { for (i = 0; entry_info->type[i] != '\0' && i < 15; i++) - PUTC(entry_info->type[i]); + PUTC(entry_info->type[i]); for (; i < 17; i++) - PUTC(' '); + PUTC(' '); } /* start the anchor */ @@ -2603,7 +2605,7 @@ unload_btree: entry_info->size); else sprintf(string_buffer, " %dKb", - entry_info->size/1024); + entry_info->size/1024); PUTS(string_buffer); } @@ -2629,13 +2631,13 @@ unload_btree: } if (WasInterrupted || HTCheckForInterrupt()) { - if (server_type != CMS_SERVER) - response(NIL); + if (server_type != CMS_SERVER) + response(NIL); _HTProgress("Data transfer interrupted."); return HT_LOADED; } if (server_type != CMS_SERVER) - response(NIL); + response(NIL); return HT_LOADED; #ifdef NOTDEFINED return response(NIL) == 2 ? HT_LOADED : -1; @@ -2648,7 +2650,7 @@ unload_btree: ** On entry, ** name WWW address of a file: document, including hostname ** On exit, -** returns Socket number for file if good. +** returns Socket number for file if good. ** <0 if bad. */ PUBLIC int HTFTPLoad ARGS4( @@ -2680,10 +2682,10 @@ PUBLIC int HTFTPLoad ARGS4( status = get_listen_socket(); if (status < 0) { NETCLOSE (control->socket); - control->socket = -1; - close_master_socket (); - /* HT_INTERRUPTED would fall through, if we could interrupt - somehow in the middle of it, which we currently can't. */ + control->socket = -1; + close_master_socket (); + /* HT_INTERRUPTED would fall through, if we could interrupt + somehow in the middle of it, which we currently can't. */ return status; } @@ -2693,22 +2695,22 @@ PUBLIC int HTFTPLoad ARGS4( { status = response(port_command); if (status == HT_INTERRUPTED) { - if (TRACE) - fprintf (stderr, + if (TRACE) + fprintf (stderr, "HTFTP: Interrupted in response (port_command)\n"); - _HTProgress ("Connection interrupted."); - NETCLOSE (control->socket); - control->socket = -1; - close_master_socket (); - return HT_INTERRUPTED; - } + _HTProgress ("Connection interrupted."); + NETCLOSE (control->socket); + control->socket = -1; + close_master_socket (); + return HT_INTERRUPTED; + } if (status != 2) { /* Could have timed out */ if (status < 0) continue; /* try again - net error*/ - return -status; /* bad reply */ + return -status; /* bad reply */ } if (TRACE) - fprintf(stderr, "HTFTP: Port defined.\n"); + fprintf(stderr, "HTFTP: Port defined.\n"); } #endif /* REPEAT_PORT */ #else /* Use PASV */ @@ -2725,7 +2727,7 @@ PUBLIC int HTFTPLoad ARGS4( if (status != 2) { if (status < 0) continue; /* retry or Bad return */ - return -status; /* bad reply */ + return -status; /* bad reply */ } for (p = response_text; *p && *p != ','; p++) ; /* null body */ @@ -2733,23 +2735,23 @@ PUBLIC int HTFTPLoad ARGS4( while (--p > response_text && '0' <= *p && *p <= '9') ; /* null body */ - status = sscanf(p+1, "%d,%d,%d,%d,%d,%d", - &h0, &h1, &h2, &h3, &p0, &p1); - if (status < 4) { - fprintf(stderr, "HTFTP: PASV reply has no inet address!\n"); - return -99; - } - passive_port = (p0<<8) + p1; + status = sscanf(p+1, "%d,%d,%d,%d,%d,%d", + &h0, &h1, &h2, &h3, &p0, &p1); + if (status < 4) { + fprintf(stderr, "HTFTP: PASV reply has no inet address!\n"); + return -99; + } + passive_port = (p0<<8) + p1; if (TRACE) - fprintf(stderr, "HTFTP: Server is listening on port %d\n", + fprintf(stderr, "HTFTP: Server is listening on port %d\n", passive_port); /* Open connection for data: */ sprintf(command, - "ftp://%d.%d.%d.%d:%d/",h0,h1,h2,h3,passive_port); - status = HTDoConnect(name, "FTP", passive_port, &data_soc); + "ftp://%d.%d.%d.%d:%d/",h0,h1,h2,h3,passive_port); + status = HTDoConnect(name, "FTP", passive_port, &data_soc); if (status < 0) { (void) HTInetStatus("connect for data"); @@ -2758,21 +2760,21 @@ PUBLIC int HTFTPLoad ARGS4( } if (TRACE) - fprintf(stderr, "FTP data connected, socket %d\n", data_soc); + fprintf(stderr, "FTP data connected, socket %d\n", data_soc); } #endif /* use PASV */ status = 0; - break; /* No more retries */ + break; /* No more retries */ } /* for retries */ if (status < 0) - return status; /* Failed with this code */ + return status; /* Failed with this code */ /* Ask for the file: */ { - char *filename = HTParse(name, "", PARSE_PATH + PARSE_PUNCTUATION); - char *fname = filename; /** Save for subsequent free() **/ + char *filename = HTParse(name, "", PARSE_PATH + PARSE_PUNCTUATION); + char *fname = filename; /** Save for subsequent free() **/ BOOL binary; char *type = NULL; char *cp; @@ -2780,7 +2782,7 @@ PUBLIC int HTFTPLoad ARGS4( if (server_type == CMS_SERVER) { /** If the unescaped path has a %2f, reject it as illegal. - FM **/ if (((cp = strstr(filename, "%2")) != NULL) && - TOUPPER(cp[2]) == 'F') { + TOUPPER(cp[2]) == 'F') { FREE(fname); init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); @@ -2798,10 +2800,10 @@ PUBLIC int HTFTPLoad ARGS4( type = "D"; } else if ((type = strrchr(filename, ';')) != NULL) { /* - ** Check and trim the type= parameter. - FM + ** Check and trim the type= parameter. - FM */ if (!strncasecomp((type+1), "type=", 5)) { - switch(TOUPPER(*(type+6))) { + switch(TOUPPER(*(type+6))) { case 'D': *type = '\0'; type = "D"; @@ -2824,7 +2826,7 @@ PUBLIC int HTFTPLoad ARGS4( } } if (TRACE && *type != '\0') { - fprintf(stderr, "HTFTP: type=%s\n", type); + fprintf(stderr, "HTFTP: type=%s\n", type); } } HTUnEscape(filename); @@ -2862,22 +2864,22 @@ PUBLIC int HTFTPLoad ARGS4( } } if (cp2) { - *cp2 = '/'; + *cp2 = '/'; } } if (strlen(filename) > 3) { char *cp2; if (((cp2=strrchr(filename, '.')) != NULL && - 0 == strncasecomp(cp2, ".me", 3)) && + 0 == strncasecomp(cp2, ".me", 3)) && (cp2[3] == '\0' || cp2[3] == ';')) { /* ** Don't treat this as application/x-Troff-me ** if it's a Unix server but has the string ** "read.me", or if it's not a Unix server. - FM */ - if ((server_type != UNIX_SERVER) || + if ((server_type != UNIX_SERVER) || (cp2 > (filename + 3) && - 0 == strncasecomp((cp2 - 4), "read.me", 7))) { + 0 == strncasecomp((cp2 - 4), "read.me", 7))) { *cp2 = '\0'; format = HTFileFormat(filename, &encoding, NULL); *cp2 = '.'; @@ -2885,7 +2887,7 @@ PUBLIC int HTFTPLoad ARGS4( format = HTFileFormat(filename, &encoding, NULL); } } else { - format = HTFileFormat(filename, &encoding, NULL); + format = HTFileFormat(filename, &encoding, NULL); } } else { format = HTFileFormat(filename, &encoding, NULL); @@ -2895,38 +2897,38 @@ PUBLIC int HTFTPLoad ARGS4( encoding != HTAtom_for("7bit")); if (!binary && /* - ** Force binary if we're in source, download or dump - ** mode and this is not a VM/CMS server, so we don't - ** get CRLF instead of LF (or CR) for newlines in text - ** files. Can't do this for VM/CMS or we'll get - ** raw EBCDIC. - FM + ** Force binary if we're in source, download or dump + ** mode and this is not a VM/CMS server, so we don't + ** get CRLF instead of LF (or CR) for newlines in text + ** files. Can't do this for VM/CMS or we'll get + ** raw EBCDIC. - FM */ (format_out == WWW_SOURCE || - format_out == HTAtom_for("www/download") || + format_out == HTAtom_for("www/download") || format_out == HTAtom_for("www/dump")) && (server_type != CMS_SERVER)) binary = TRUE; if (!binary && type && *type == 'I') { /* - ** Force binary if we had ;type=I - FM + ** Force binary if we had ;type=I - FM */ binary = TRUE; } else if (binary && type && *type == 'A') { /* - ** Force ASCII if we had ;type=A - FM + ** Force ASCII if we had ;type=A - FM */ binary = FALSE; } - if (binary != control->binary) { + if (binary != control->binary) { /* - ** Act on our setting if not alread set. - FM + ** Act on our setting if not alread set. - FM */ char * mode = binary ? "I" : "A"; sprintf(command, "TYPE %s%c%c", mode, CR, LF); status = response(command); if (status != 2) { init_help_message_cache(); /* to free memory */ - return ((status < 0) ? status : -status); + return ((status < 0) ? status : -status); } control->binary = binary; } @@ -2942,7 +2944,7 @@ PUBLIC int HTFTPLoad ARGS4( BOOL included_device = FALSE; /** Accept only Unix-style filename **/ if (strchr(filename, ':') != NULL || - strchr(filename, '[') != NULL) { + strchr(filename, '[') != NULL) { FREE(fname); init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); @@ -2955,7 +2957,7 @@ PUBLIC int HTFTPLoad ARGS4( } /** Handle any unescaped "/%2F" path **/ if (!strncmp(filename, "//", 2)) { - int i; + int i; included_device = TRUE; for (i = 0; filename[(i+1)]; i++) filename[i] = filename[(i+1)]; @@ -2970,21 +2972,21 @@ PUBLIC int HTFTPLoad ARGS4( if ((cp1=strrchr(cp, ']')) != NULL) { cp1++; for (i = 0; cp1[i]; i++) - filename[i] = cp1[i]; + filename[i] = cp1[i]; filename[i] = '\0'; if (TRACE) { - fprintf(stderr, "HTFTP: Filename '%s'\n", filename); + fprintf(stderr, "HTFTP: Filename '%s'\n", filename); } *cp1 = '\0'; sprintf(command, "CWD %s%c%c", cp, CR, LF); status = response (command); if (status != 2) { - if ((cp1=strchr(cp, '[')) != NULL) { + if ((cp1=strchr(cp, '[')) != NULL) { *cp1++ = '\0'; sprintf(command, "CWD %s%c%c", cp, CR, LF); status = response (command); if (status != 2) { - FREE(fname); + FREE(fname); init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; @@ -2993,15 +2995,15 @@ PUBLIC int HTFTPLoad ARGS4( sprintf(command, "CWD [.%s%c%c", cp1, CR, LF); status = response (command); if (status != 2) { - FREE(fname); + FREE(fname); init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); } } else { - FREE(fname); - init_help_message_cache(); /* to free memory */ + FREE(fname); + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); @@ -3018,7 +3020,7 @@ PUBLIC int HTFTPLoad ARGS4( if (TRACE) { fprintf(stderr, "HTFTP: Filename '%s'\n", filename); } - *cp1 = '\0'; + *cp1 = '\0'; strcat(cp, "["); strcat(cp, filename); strcat(cp, "]"); @@ -3030,15 +3032,15 @@ PUBLIC int HTFTPLoad ARGS4( sprintf(command, "CWD %s%c%c", cp, CR, LF); status = response (command); if (status != 2) { - *cp1 = '\0'; + *cp1 = '\0'; sprintf(command, "CWD %s%c%c", cp, CR, LF); status = response (command); if (status != 2) { - FREE(fname); + FREE(fname); init_help_message_cache(); NETCLOSE(control->socket); control->socket = -1; - return ((status < 0) ? status : -status); + return ((status < 0) ? status : -status); } } } else { @@ -3055,7 +3057,7 @@ PUBLIC int HTFTPLoad ARGS4( status = response (command); if (status != 2) { FREE(fname); - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); @@ -3067,35 +3069,35 @@ PUBLIC int HTFTPLoad ARGS4( } /** Trim trailing slash if filename is not the top directory **/ if (strlen(filename) > 1 && filename[strlen(filename)-1] == '/') - filename[strlen(filename)-1] = '\0'; + filename[strlen(filename)-1] = '\0'; #ifdef MAINTAIN_CONNECTION /* Don't need this if always new connection - F.M. */ if (!included_device) { - /** Get the current default VMS device:[directory] **/ - sprintf(command, "PWD%c%c", CR, LF); - status = response (command); - if (status != 2) { - FREE(fname); - init_help_message_cache(); /* to free memory */ + /** Get the current default VMS device:[directory] **/ + sprintf(command, "PWD%c%c", CR, LF); + status = response (command); + if (status != 2) { + FREE(fname); + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); - } - /** Go to the VMS account's top directory **/ - if ((cp=strchr(response_text, '[')) != NULL && - (cp1=strrchr(response_text, ']')) != NULL) { + } + /** Go to the VMS account's top directory **/ + if ((cp=strchr(response_text, '[')) != NULL && + (cp1=strrchr(response_text, ']')) != NULL) { sprintf(command, "CWD %s", cp); if ((cp2=strchr(cp, '.')) != NULL && cp2 < cp1) - sprintf(command+(cp2-cp)+4, "]%c%c", CR, LF); + sprintf(command+(cp2-cp)+4, "]%c%c", CR, LF); else - sprintf(command+(cp1-cp)+4, "]%c%c", CR, LF); + sprintf(command+(cp1-cp)+4, "]%c%c", CR, LF); status = response (command); if (status != 2) { - FREE(fname); + FREE(fname); init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; - return ((status < 0) ? status : -status); + return ((status < 0) ? status : -status); } } } @@ -3103,15 +3105,15 @@ PUBLIC int HTFTPLoad ARGS4( /** If we want the VMS account's top directory, list it now **/ if (!(strcmp(filename, "/~")) || - (included_device && 0==strcmp(filename, "000000")) || - (strlen(filename) == 1 && *filename == '/')) { + (included_device && 0==strcmp(filename, "000000")) || + (strlen(filename) == 1 && *filename == '/')) { isDirectory = YES; sprintf(command, "LIST%c%c", CR, LF); status = response (command); FREE(fname); if (status != 1) { /* Action not started */ - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); @@ -3121,10 +3123,10 @@ PUBLIC int HTFTPLoad ARGS4( } /** Otherwise, go to appropriate directory and doctor filename **/ if (!strncmp(filename, "/~", 2)) - filename += 2; + filename += 2; if (!included_device && - (cp = strchr(filename, '/')) != NULL && - (cp1 = strrchr(cp, '/')) != NULL && cp != cp1) { + (cp = strchr(filename, '/')) != NULL && + (cp1 = strrchr(cp, '/')) != NULL && cp != cp1) { sprintf(command, "CWD [.%s", cp+1); sprintf(command+(cp1-cp)+5, "]%c%c", CR, LF); while ((cp2 = strrchr(command, '/')) != NULL) @@ -3132,15 +3134,15 @@ PUBLIC int HTFTPLoad ARGS4( status = response(command); if (status != 2) { FREE(fname); - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); } filename = cp1+1; } else { - if (!included_device) { - filename += 1; + if (!included_device) { + filename += 1; } } break; @@ -3148,12 +3150,12 @@ PUBLIC int HTFTPLoad ARGS4( case CMS_SERVER: { /* - ** If we want the CMS account's top directory, or a base - ** SFS or anonymous directory path (i.e., without a slash), - ** list it now. FM + ** If we want the CMS account's top directory, or a base + ** SFS or anonymous directory path (i.e., without a slash), + ** list it now. FM */ if ((strlen(filename) == 1 && *filename == '/') || - ((0 == strncasecomp((filename+1), "vmsysu:", 7)) && + ((0 == strncasecomp((filename+1), "vmsysu:", 7)) && (cp = strchr((filename+1), '.')) != NULL && strchr(cp, '/') == NULL) || (0 == strncasecomp(filename+1, "anonymou.", 9) && @@ -3162,7 +3164,7 @@ PUBLIC int HTFTPLoad ARGS4( sprintf(command, "CWD %s%c%c", (filename+1), CR, LF); status = response(command); if (status != 2) { - /* Action not started */ + /* Action not started */ init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; @@ -3178,7 +3180,7 @@ PUBLIC int HTFTPLoad ARGS4( FREE(fname); if (status != 1) { /* Action not started */ - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); @@ -3190,7 +3192,7 @@ PUBLIC int HTFTPLoad ARGS4( /** Otherwise, go to appropriate directory and adjust filename **/ while ((cp = strchr(filename, '/')) != NULL) { - *cp++ = '\0'; + *cp++ = '\0'; sprintf(command, "CWD %s%c%c", filename, CR, LF); status = response(command); if (status == 2) { @@ -3204,7 +3206,7 @@ PUBLIC int HTFTPLoad ARGS4( FREE(fname); if (status != 1) { /** Action not started **/ - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; return ((status < 0) ? status : -status); @@ -3222,7 +3224,7 @@ PUBLIC int HTFTPLoad ARGS4( default: /** Shift for any unescaped "/%2F" path **/ if (!strncmp(filename, "//", 2)) - filename++; + filename++; break; } /* @@ -3233,34 +3235,34 @@ PUBLIC int HTFTPLoad ARGS4( sprintf(command, "RETR %s%c%c", filename, CR, LF); status = response(command); } else { - status = 5; /* Failed status set as flag. - FM */ + status = 5; /* Failed status set as flag. - FM */ } if (status != 1) { /* Failed : try to CWD to it */ /** Clear any login messages if this isn't the login directory **/ if (strcmp(filename, "/")) - init_help_message_cache(); + init_help_message_cache(); sprintf(command, "CWD %s%c%c", filename, CR, LF); status = response(command); - if (status == 2) { /* Successed : let's NAME LIST it */ - isDirectory = YES; + if (status == 2) { /* Successed : let's NAME LIST it */ + isDirectory = YES; if (use_list) - sprintf(command, "LIST%c%c", CR, LF); + sprintf(command, "LIST%c%c", CR, LF); else - sprintf(command, "NLST%c%c", CR, LF); + sprintf(command, "NLST%c%c", CR, LF); status = response (command); } } FREE(fname); if (status != 1) { - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ NETCLOSE(control->socket); control->socket = -1; if (status < 0) - return status; + return status; else - return -status; + return -status; } } @@ -3270,7 +3272,7 @@ listen: */ { struct sockaddr_in soc_address; - int soc_addrlen=sizeof(soc_address); + int soc_addrlen=sizeof(soc_address); #ifdef SOCKS if (socks_flag) status = Raccept(master_socket, @@ -3282,7 +3284,7 @@ listen: (struct sockaddr *)&soc_address, (void *)&soc_addrlen); if (status < 0) { - init_help_message_cache(); /* to free memory */ + init_help_message_cache(); /* to free memory */ return HTInetStatus("accept"); } CTRACE(tfp, "TCP: Accepted new socket %d\n", status); @@ -3292,15 +3294,15 @@ listen: /* @@ */ #endif /* LISTEN */ if (isDirectory) { - status = read_directory (anchor, name, format_out, sink); - NETCLOSE(data_soc); + status = read_directory (anchor, name, format_out, sink); + NETCLOSE(data_soc); NETCLOSE(control->socket); control->socket = -1; init_help_message_cache(); /* to free memory */ - return status; + return status; /* returns HT_LOADED or error */ } else { - int rv; + int rv; int len; char *FileName = HTParse(name, "", PARSE_PATH + PARSE_PUNCTUATION); @@ -3311,9 +3313,9 @@ listen: HTUnEscape(FileName); if (!IsUnityEnc(encoding)) { /* - * We already know from the call to HTFileFormat above that - * this is a compressed file, no need to look at the filename - * again. - kw + * We already know from the call to HTFileFormat above that + * this is a compressed file, no need to look at the filename + * again. - kw */ StrAllocCopy(anchor->content_type, format->name); StrAllocCopy(anchor->content_encoding, HTAtom_name(encoding)); @@ -3321,7 +3323,7 @@ listen: } else if ((len = strlen(FileName)) > 2) { if ((FileName[len - 1] == 'Z') && - (FileName[len - 2] == '.' || + (FileName[len - 2] == '.' || FileName[len - 2] == '-' || FileName[len - 2] == '_')) { @@ -3332,7 +3334,7 @@ listen: StrAllocCopy(anchor->content_encoding, "x-compress"); format = HTAtom_for("www/compressed"); } else if ((len > 3) && - !strcasecomp((char *)&FileName[len - 2], "gz")) { + !strcasecomp((char *)&FileName[len - 2], "gz")) { if (FileName[len - 3] == '.' || FileName[len - 3] == '-' || FileName[len - 3] == '_') { @@ -3367,7 +3369,7 @@ listen: status = response(NIL); /* Pick up final reply */ if (status != 2 && rv != HT_INTERRUPTED && rv != -1) { init_help_message_cache(); /* to free memory */ - return HTLoadError(sink, 500, response_text); + return HTLoadError(sink, 500, response_text); } } @@ -3385,15 +3387,15 @@ listen: PUBLIC void HTClearFTPPassword NOARGS { /* - ** Need code to check cached documents from - ** non-anonymous ftp accounts and do something - ** to ensure that they no longer can be accessed - ** without a new retrieval. - FM + ** Need code to check cached documents from + ** non-anonymous ftp accounts and do something + ** to ensure that they no longer can be accessed + ** without a new retrieval. - FM */ /* - ** Now free the current user entered password, - ** if any. - FM + ** Now free the current user entered password, + ** if any. - FM */ FREE(user_entered_password); } diff --git a/WWW/Library/Implementation/HTFTP.h b/WWW/Library/Implementation/HTFTP.h index 814772d4..6bcec339 100644 --- a/WWW/Library/Implementation/HTFTP.h +++ b/WWW/Library/Implementation/HTFTP.h @@ -11,11 +11,11 @@ #define HTFTP_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTAnchor.h" -#include "HTStream.h" -#include "HTParse.h" +#include <HTAnchor.h> +#include <HTStream.h> +#include <HTParse.h> #define FILE_BY_NAME 0 #define FILE_BY_TYPE 1 diff --git a/WWW/Library/Implementation/HTFWriter.c b/WWW/Library/Implementation/HTFWriter.c index 8ef9ba1b..8de75085 100644 --- a/WWW/Library/Implementation/HTFWriter.c +++ b/WWW/Library/Implementation/HTFWriter.c @@ -8,15 +8,15 @@ ** strings written must be less than buffer size. */ -#include "HTUtils.h" +#include <HTUtils.h> -#include "HTFWriter.h" +#include <HTFWriter.h> -#include "HTFormat.h" -#include "HTAlert.h" -#include "HTFile.h" +#include <HTFormat.h> +#include <HTAlert.h> +#include <HTFile.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTFWriter.h b/WWW/Library/Implementation/HTFWriter.h index 052bdd7e..334169e7 100644 --- a/WWW/Library/Implementation/HTFWriter.h +++ b/WWW/Library/Implementation/HTFWriter.h @@ -9,11 +9,11 @@ #define HTFWRITE_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTStream.h" +#include <HTStream.h> /*#include <stdio.h> included by HTUtils.h -- FM */ -#include "HTFormat.h" +#include <HTFormat.h> #ifdef SHORT_NAMES #define HTFWriter_new HTFWnew diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c index 89a93d14..3bc93f1e 100644 --- a/WWW/Library/Implementation/HTFile.c +++ b/WWW/Library/Implementation/HTFile.c @@ -27,14 +27,13 @@ #ifdef DOSPATH #define HAVE_READDIR 1 -#include <dirent.h> #define USE_DIRENT -#include "HTDOS.h" +#include <HTDOS.h> #endif /* DOSPATH */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTFile.h" /* Implemented here */ +#include <HTUtils.h> +#include <tcp.h> +#include <HTFile.h> /* Implemented here */ #ifdef VMS #include <stat.h> #endif /* VMS */ @@ -58,31 +57,31 @@ #define FREE(x) if (x) {free(x); x = NULL;} #ifdef VMS -#include "HTVMSUtils.h" +#include <HTVMSUtils.h> #endif /* VMS */ -#include "HTParse.h" -#include "HTTCP.h" +#include <HTParse.h> +#include <HTTCP.h> #ifndef DECNET -#include "HTFTP.h" +#include <HTFTP.h> #endif /* !DECNET */ -#include "HTAnchor.h" -#include "HTAtom.h" -#include "HTWriter.h" -#include "HTFWriter.h" -#include "HTInit.h" -#include "HTBTree.h" -#include "HTAlert.h" -#include "HTCJK.h" -#include "UCDefs.h" -#include "UCMap.h" -#include "UCAux.h" - -#include "LYexit.h" -#include "LYCharSets.h" -#include "LYGlobalDefs.h" -#include "LYUtils.h" -#include "LYLeaks.h" +#include <HTAnchor.h> +#include <HTAtom.h> +#include <HTWriter.h> +#include <HTFWriter.h> +#include <HTInit.h> +#include <HTBTree.h> +#include <HTAlert.h> +#include <HTCJK.h> +#include <UCDefs.h> +#include <UCMap.h> +#include <UCAux.h> + +#include <LYexit.h> +#include <LYCharSets.h> +#include <LYGlobalDefs.h> +#include <LYUtils.h> +#include <LYLeaks.h> typedef struct _HTSuffix { char * suffix; @@ -100,7 +99,7 @@ typedef struct _HTSuffix { #endif /* NGROUPS_MAX */ #endif /* NGROUPS */ -#include "HTML.h" /* For directory object building */ +#include <HTML.h> /* For directory object building */ #define PUTC(c) (*target->isa->put_character)(target, c) #define PUTS(s) (*target->isa->put_string)(target, s) diff --git a/WWW/Library/Implementation/HTFile.h b/WWW/Library/Implementation/HTFile.h index b65c17e7..867e00d7 100644 --- a/WWW/Library/Implementation/HTFile.h +++ b/WWW/Library/Implementation/HTFile.h @@ -10,10 +10,10 @@ #ifndef HTFILE_H #define HTFILE_H -#include "HTFormat.h" -#include "HTAccess.h" +#include <HTFormat.h> +#include <HTAccess.h> #ifndef HTML_H -#include "HTML.h" /* SCW */ +#include <HTML.h> /* SCW */ #endif /* HTML_H */ /* diff --git a/WWW/Library/Implementation/HTFinger.c b/WWW/Library/Implementation/HTFinger.c index e714e0d2..042d137c 100644 --- a/WWW/Library/Implementation/HTFinger.c +++ b/WWW/Library/Implementation/HTFinger.c @@ -25,17 +25,17 @@ ** relayed from HTLoadGopher. - FM */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAlert.h" -#include "HTML.h" -#include "HTParse.h" -#include "HTFormat.h" -#include "HTTCP.h" -#include "HTString.h" -#include "HTFinger.h" - -#include "LYLeaks.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAlert.h> +#include <HTML.h> +#include <HTParse.h> +#include <HTFormat.h> +#include <HTTCP.h> +#include <HTString.h> +#include <HTFinger.h> + +#include <LYLeaks.h> /* #define TRACE 1 */ diff --git a/WWW/Library/Implementation/HTFinger.h b/WWW/Library/Implementation/HTFinger.h index 98d98070..8fece0ec 100644 --- a/WWW/Library/Implementation/HTFinger.h +++ b/WWW/Library/Implementation/HTFinger.h @@ -6,8 +6,8 @@ #ifndef HTFINGER_H #define HTFINGER_H -#include "HTAccess.h" -#include "HTAnchor.h" +#include <HTAccess.h> +#include <HTAnchor.h> #ifdef GLOBALREF_IS_MACRO extern GLOBALREF (HTProtocol, HTFinger); diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c index c05af1fa..baffca71 100644 --- a/WWW/Library/Implementation/HTFormat.c +++ b/WWW/Library/Implementation/HTFormat.c @@ -10,13 +10,13 @@ ** */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTAccess.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTAccess.h> /* Implements: */ -#include "HTFormat.h" +#include <HTFormat.h> PUBLIC float HTMaxSecs = 1e10; /* No effective limit */ PUBLIC float HTMaxLength = 1e10; /* No effective limit */ @@ -31,25 +31,25 @@ PUBLIC long int HTMaxBytes = 0; /* No effective limit */ #endif /* NeXT */ #endif /* unix */ -#include "HTML.h" -#include "HTMLDTD.h" -#include "HText.h" -#include "HTAlert.h" -#include "HTList.h" -#include "HTInit.h" -#include "HTTCP.h" +#include <HTML.h> +#include <HTMLDTD.h> +#include <HText.h> +#include <HTAlert.h> +#include <HTList.h> +#include <HTInit.h> +#include <HTTCP.h> /* Streams and structured streams which we use: */ -#include "HTFWriter.h" -#include "HTPlain.h" -#include "SGML.h" -#include "HTML.h" -#include "HTMLGen.h" - -#include "LYexit.h" -#include "LYUtils.h" -#include "LYGlobalDefs.h" -#include "LYLeaks.h" +#include <HTFWriter.h> +#include <HTPlain.h> +#include <SGML.h> +#include <HTML.h> +#include <HTMLGen.h> + +#include <LYexit.h> +#include <LYUtils.h> +#include <LYGlobalDefs.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTFormat.h b/WWW/Library/Implementation/HTFormat.h index 225456b6..866174a9 100644 --- a/WWW/Library/Implementation/HTFormat.h +++ b/WWW/Library/Implementation/HTFormat.h @@ -15,11 +15,11 @@ Preamble #define HTFORMAT_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTStream.h" -#include "HTAtom.h" -#include "HTList.h" +#include <HTStream.h> +#include <HTAtom.h> +#include <HTList.h> #ifdef SHORT_NAMES #define HTOutputSource HTOuSour @@ -138,7 +138,7 @@ typedef HTAtom* HTEncoding; (enc)==WWW_ENC_8BIT || (enc)==WWW_ENC_BINARY || (enc)==WWW_ENC_7BIT) -#include "HTAnchor.h" +#include <HTAnchor.h> /* diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c index 23e8f9d0..e168ac8e 100644 --- a/WWW/Library/Implementation/HTGopher.c +++ b/WWW/Library/Implementation/HTGopher.c @@ -15,17 +15,17 @@ ** gateway. */ -#include "HTUtils.h" /* Coding convention macros */ -#include "tcp.h" -#include "HTAlert.h" -#include "HTParse.h" -#include "HTTCP.h" -#include "HTFinger.h" +#include <HTUtils.h> /* Coding convention macros */ +#include <tcp.h> +#include <HTAlert.h> +#include <HTParse.h> +#include <HTTCP.h> +#include <HTFinger.h> /* ** Implements. */ -#include "HTGopher.h" +#include <HTGopher.h> #define HT_EM_SPACE ((char)2) /* For now */ @@ -63,18 +63,18 @@ #include <ctype.h> -#include "HTParse.h" -#include "HTFormat.h" -#include "HTTCP.h" +#include <HTParse.h> +#include <HTFormat.h> +#include <HTTCP.h> #define FREE(x) if (x) {free(x); x = NULL;} /* ** Hypertext object building machinery. */ -#include "HTML.h" +#include <HTML.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define PUTC(c) (*targetClass.put_character)(target, c) #define PUTS(s) (*targetClass.put_string)(target, s) diff --git a/WWW/Library/Implementation/HTGopher.h b/WWW/Library/Implementation/HTGopher.h index 947bd3e9..03b89675 100644 --- a/WWW/Library/Implementation/HTGopher.h +++ b/WWW/Library/Implementation/HTGopher.h @@ -11,8 +11,8 @@ #ifndef HTGOPHER_H #define HTGOPHER_H -#include "HTAccess.h" -#include "HTAnchor.h" +#include <HTAccess.h> +#include <HTAnchor.h> #ifdef GLOBALREF_IS_MACRO extern GLOBALREF (HTProtocol, HTGopher); diff --git a/WWW/Library/Implementation/HTGroup.c b/WWW/Library/Implementation/HTGroup.c index f6b17578..d48c298d 100644 --- a/WWW/Library/Implementation/HTGroup.c +++ b/WWW/Library/Implementation/HTGroup.c @@ -43,13 +43,13 @@ -#include "HTUtils.h" +#include <HTUtils.h> #include <string.h> -#include "HTAAUtil.h" -#include "HTLex.h" /* Lexical analysor */ -#include "HTGroup.h" /* Implemented here */ +#include <HTAAUtil.h> +#include <HTLex.h> /* Lexical analysor */ +#include <HTGroup.h> /* Implemented here */ -#include "LYLeaks.h" +#include <LYLeaks.h> /* ** Group file parser diff --git a/WWW/Library/Implementation/HTGroup.h b/WWW/Library/Implementation/HTGroup.h index 496a5077..398aa0bf 100644 --- a/WWW/Library/Implementation/HTGroup.h +++ b/WWW/Library/Implementation/HTGroup.h @@ -6,9 +6,9 @@ #define HTGROUP_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTList.h" +#include <HTList.h> #ifdef SHORT_NAMES #define HTAApGrD HTAA_parseGroupDef diff --git a/WWW/Library/Implementation/HTHistory.c b/WWW/Library/Implementation/HTHistory.c index 726380a6..232e4341 100644 --- a/WWW/Library/Implementation/HTHistory.c +++ b/WWW/Library/Implementation/HTHistory.c @@ -1,9 +1,9 @@ -#include "HTUtils.h" -#include "tcp.h" /* for standard io */ +#include <HTUtils.h> +#include <tcp.h> /* for standard io */ -#include "HTHistory.h" +#include <HTHistory.h> -#include "LYLeaks.h" +#include <LYLeaks.h> static HTList * history; /* List of visited anchors */ diff --git a/WWW/Library/Implementation/HTHistory.h b/WWW/Library/Implementation/HTHistory.h index a93781e9..dc953d82 100644 --- a/WWW/Library/Implementation/HTHistory.h +++ b/WWW/Library/Implementation/HTHistory.h @@ -3,7 +3,7 @@ #ifndef HTHISTORY_H #define HTHISTORY_H -#include "HTAnchor.h" +#include <HTAnchor.h> #ifdef SHORT_NAMES #define HTHistory_record HTHiReco diff --git a/WWW/Library/Implementation/HTInit.c b/WWW/Library/Implementation/HTInit.c index 764da7b5..d367ca06 100644 --- a/WWW/Library/Implementation/HTInit.c +++ b/WWW/Library/Implementation/HTInit.c @@ -7,22 +7,22 @@ ** */ -#include "HTUtils.h" +#include <HTUtils.h> /* Implements: */ -#include "HTInit.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 "HTFWriter.h" +#include <HTML.h> +#include <HTPlain.h> +#include <HTMLGen.h> +#include <HTFile.h> +#include <HTFormat.h> +#include <HTMIME.h> +#include <HTWSRC.h> +#include <HTFWriter.h> -#include "LYLeaks.h" +#include <LYLeaks.h> PUBLIC void HTFormatInit NOARGS { diff --git a/WWW/Library/Implementation/HTInit.h b/WWW/Library/Implementation/HTInit.h index 61c7d776..a003a6b5 100644 --- a/WWW/Library/Implementation/HTInit.h +++ b/WWW/Library/Implementation/HTInit.h @@ -11,7 +11,7 @@ */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ extern void HTFormatInit NOPARAMS; diff --git a/WWW/Library/Implementation/HTLex.c b/WWW/Library/Implementation/HTLex.c index 26870170..6cffe648 100644 --- a/WWW/Library/Implementation/HTLex.c +++ b/WWW/Library/Implementation/HTLex.c @@ -13,11 +13,11 @@ ** */ -#include "HTUtils.h" -#include "HTAAUtil.h" -#include "HTLex.h" /* Implemented here */ +#include <HTUtils.h> +#include <HTAAUtil.h> +#include <HTLex.h> /* Implemented here */ -#include "LYLeaks.h" +#include <LYLeaks.h> /* ** Global variables diff --git a/WWW/Library/Implementation/HTLex.h b/WWW/Library/Implementation/HTLex.h index 5895579b..dd02c3ae 100644 --- a/WWW/Library/Implementation/HTLex.h +++ b/WWW/Library/Implementation/HTLex.h @@ -6,7 +6,7 @@ #define HTLEX_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ diff --git a/WWW/Library/Implementation/HTList.c b/WWW/Library/Implementation/HTList.c index 839e961d..28958181 100644 --- a/WWW/Library/Implementation/HTList.c +++ b/WWW/Library/Implementation/HTList.c @@ -6,12 +6,12 @@ ** New nodes are inserted between the header and the rest of the list. */ -#include "HTUtils.h" -#include "HTList.h" +#include <HTUtils.h> +#include <HTList.h> /*#include <stdio.h> included by HTUtils.h -- FM *//* joe@athena, TBL 921019 */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTList.h b/WWW/Library/Implementation/HTList.h index 89c0e62b..095308c1 100644 --- a/WWW/Library/Implementation/HTList.h +++ b/WWW/Library/Implementation/HTList.h @@ -8,7 +8,7 @@ #define HTLIST_H #ifndef HTUTILS_H -#include "HTUtils.h" /* for BOOL type and PARAMS and ARGS*/ +#include <HTUtils.h> /* for BOOL type and PARAMS and ARGS*/ #endif /* HTUTILS_H */ typedef struct _HTList HTList; diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c index 556459c5..44a554eb 100644 --- a/WWW/Library/Implementation/HTMIME.c +++ b/WWW/Library/Implementation/HTMIME.c @@ -11,16 +11,16 @@ ** Feb 92 Written Tim Berners-Lee, CERN ** */ -#include "HTUtils.h" -#include "HTMIME.h" /* Implemented here */ -#include "HTAlert.h" -#include "HTCJK.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "UCAux.h" - -#include "LYCharSets.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <HTMIME.h> /* Implemented here */ +#include <HTAlert.h> +#include <HTCJK.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <UCAux.h> + +#include <LYCharSets.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTMIME.h b/WWW/Library/Implementation/HTMIME.h index 823f6c76..88130d70 100644 --- a/WWW/Library/Implementation/HTMIME.h +++ b/WWW/Library/Implementation/HTMIME.h @@ -23,8 +23,8 @@ #ifndef HTMIME_H #define HTMIME_H -#include "HTStream.h" -#include "HTAnchor.h" +#include <HTStream.h> +#include <HTAnchor.h> /* ** This function is for trimming off any paired diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c index 0d616bf1..bf7a54b7 100644 --- a/WWW/Library/Implementation/HTMLDTD.c +++ b/WWW/Library/Implementation/HTMLDTD.c @@ -5,9 +5,9 @@ /* Implements: */ -#include "HTUtils.h" -#include "HTMLDTD.h" -#include "LYLeaks.h" +#include <HTUtils.h> +#include <HTMLDTD.h> +#include <LYLeaks.h> /* Entity Names ** ------------ @@ -1330,7 +1330,7 @@ static attr ulist_attr[] = { /* UL attributes */ ** ** Name, Attributes, No. of attributes, content, extra info... */ -static HTTag tags_old[HTML_ELEMENTS] = { +static CONST HTTag tags_old[HTML_ELEMENTS] = { { "A" , a_attr, HTML_A_ATTRIBUTES, SGML_EMPTY,T_A}, { "ABBREV" , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_ABBREV}, { "ACRONYM" , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_ACRONYM}, @@ -1451,7 +1451,7 @@ static HTTag tags_old[HTML_ELEMENTS] = { { "XMP" , gen_attr, HTML_GEN_ATTRIBUTES, SGML_LITTERAL,T_XMP}, }; -static HTTag tags_new[HTML_ELEMENTS] = { +static CONST HTTag tags_new[HTML_ELEMENTS] = { { "A" , a_attr, HTML_A_ATTRIBUTES, SGML_MIXED,T_A}, { "ABBREV" , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_ABBREV}, { "ACRONYM" , gen_attr, HTML_GEN_ATTRIBUTES, SGML_MIXED,T_ACRONYM}, diff --git a/WWW/Library/Implementation/HTMLDTD.h b/WWW/Library/Implementation/HTMLDTD.h index 15004a1d..07ce5195 100644 --- a/WWW/Library/Implementation/HTMLDTD.h +++ b/WWW/Library/Implementation/HTMLDTD.h @@ -13,9 +13,9 @@ #define HTMLDTD_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "SGML.h" +#include <SGML.h> /* ** Lynx internal character representations. diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c index 1839f3c4..da2b63e5 100644 --- a/WWW/Library/Implementation/HTMLGen.c +++ b/WWW/Library/Implementation/HTMLGen.c @@ -12,23 +12,23 @@ ** which is cleanest. */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> #define BUFFER_SIZE 200 /* Line buffer attempts to make neat breaks */ #define MAX_CLEANNESS 20 /* Implements: */ -#include "HTMLGen.h" +#include <HTMLGen.h> #include <stdio.h> -#include "HTMLDTD.h" -#include "HTStream.h" -#include "SGML.h" -#include "HTFormat.h" +#include <HTMLDTD.h> +#include <HTStream.h> +#include <SGML.h> +#include <HTFormat.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTMLGen.h b/WWW/Library/Implementation/HTMLGen.h index ac814ad8..b34b39d2 100644 --- a/WWW/Library/Implementation/HTMLGen.h +++ b/WWW/Library/Implementation/HTMLGen.h @@ -8,8 +8,8 @@ #ifndef HTMLGEN_H #define HTMLGEN_H -#include "HTML.h" -#include "HTStream.h" +#include <HTML.h> +#include <HTStream.h> /* Subclass: */ diff --git a/WWW/Library/Implementation/HTNews.c b/WWW/Library/Implementation/HTNews.c index 2094df68..89048385 100644 --- a/WWW/Library/Implementation/HTNews.c +++ b/WWW/Library/Implementation/HTNews.c @@ -6,16 +6,16 @@ ** 29 Nov 91 Downgraded to C, for portable implementation. */ -#include "HTUtils.h" /* Coding convention macros */ -#include "tcp.h" +#include <HTUtils.h> /* Coding convention macros */ +#include <tcp.h> /* Implements: */ -#include "HTNews.h" +#include <HTNews.h> -#include "HTCJK.h" -#include "HTMIME.h" -#include "HTTCP.h" +#include <HTCJK.h> +#include <HTMIME.h> +#include <HTTCP.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -41,14 +41,14 @@ PUBLIC int HTNewsMaxChunk = 40; /* Largest number of articles in one window */ #include <ctype.h> -#include "HTML.h" -#include "HTParse.h" -#include "HTFormat.h" -#include "HTAlert.h" +#include <HTML.h> +#include <HTParse.h> +#include <HTFormat.h> +#include <HTAlert.h> -#include "LYNews.h" -#include "LYGlobalDefs.h" -#include "LYLeaks.h" +#include <LYNews.h> +#include <LYGlobalDefs.h> +#include <LYLeaks.h> #define BIG 1024 /* @@@ */ diff --git a/WWW/Library/Implementation/HTNews.h b/WWW/Library/Implementation/HTNews.h index bc25fc87..2e017fce 100644 --- a/WWW/Library/Implementation/HTNews.h +++ b/WWW/Library/Implementation/HTNews.h @@ -10,8 +10,8 @@ #ifndef HTNEWS_H #define HTNEWS_H -#include "HTAccess.h" -#include "HTAnchor.h" +#include <HTAccess.h> +#include <HTAnchor.h> #ifdef GLOBALREF_IS_MACRO extern GLOBALREF(HTProtocol, HTNews); diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c index 655801fa..97d3f5ea 100644 --- a/WWW/Library/Implementation/HTParse.c +++ b/WWW/Library/Implementation/HTParse.c @@ -2,11 +2,11 @@ ** ================================ */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTParse.h b/WWW/Library/Implementation/HTParse.h index 2f77f079..cf42d97b 100644 --- a/WWW/Library/Implementation/HTParse.h +++ b/WWW/Library/Implementation/HTParse.h @@ -9,7 +9,7 @@ #define HTPARSE_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ /* diff --git a/WWW/Library/Implementation/HTPasswd.c b/WWW/Library/Implementation/HTPasswd.c index ada39ee5..45a53aee 100644 --- a/WWW/Library/Implementation/HTPasswd.c +++ b/WWW/Library/Implementation/HTPasswd.c @@ -16,15 +16,15 @@ */ -#include "HTUtils.h" -#include "tcp.h" /* FROMASCII() */ +#include <HTUtils.h> +#include <tcp.h> /* FROMASCII() */ #include <string.h> -#include "HTAAUtil.h" /* Common parts of AA */ -#include "HTAAFile.h" /* File routines */ -#include "HTAAServ.h" /* Server routines */ -#include "HTPasswd.h" /* Implemented here */ +#include <HTAAUtil.h> /* Common parts of AA */ +#include <HTAAFile.h> /* File routines */ +#include <HTAAServ.h> /* Server routines */ +#include <HTPasswd.h> /* Implemented here */ -#include "LYLeaks.h" +#include <LYLeaks.h> extern char *crypt(); diff --git a/WWW/Library/Implementation/HTPasswd.h b/WWW/Library/Implementation/HTPasswd.h index 0c3b3eb6..b82d1d4e 100644 --- a/WWW/Library/Implementation/HTPasswd.h +++ b/WWW/Library/Implementation/HTPasswd.h @@ -6,9 +6,9 @@ #define HTPASSWD_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTList.h" +#include <HTList.h> #ifdef SHORT_NAMES #define HTAAenPw HTAA_encryptPasswd diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c index dda98d5f..14b89bf8 100644 --- a/WWW/Library/Implementation/HTPlain.c +++ b/WWW/Library/Implementation/HTPlain.c @@ -7,29 +7,29 @@ ** Bugs: ** strings written must be less than buffer size. */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "HTPlain.h" +#include <HTPlain.h> -#include "HTChunk.h" -#include "HText.h" -#include "HTStyle.h" +#include <HTChunk.h> +#include <HText.h> +#include <HTStyle.h> #define Lynx_HTML_Handler -#include "HTML.h" /* styles[] */ +#include <HTML.h> /* styles[] */ #define BUFFER_SIZE 4096; /* Tradeoff */ -#include "HText.h" -#include "HTStyle.h" -#include "HTMLDTD.h" -#include "HTCJK.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "UCAux.h" +#include <HText.h> +#include <HTStyle.h> +#include <HTMLDTD.h> +#include <HTCJK.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <UCAux.h> -#include "LYCharSets.h" -#include "LYLeaks.h" +#include <LYCharSets.h> +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTPlain.h b/WWW/Library/Implementation/HTPlain.h index f4ce3e14..0d363f04 100644 --- a/WWW/Library/Implementation/HTPlain.h +++ b/WWW/Library/Implementation/HTPlain.h @@ -5,8 +5,8 @@ #ifndef HTPLAIN_H #define HTPLAIN_H -#include "HTStream.h" -#include "HTAnchor.h" +#include <HTStream.h> +#include <HTAnchor.h> extern HTStream* HTPlainPresent PARAMS(( HTPresentation * pres, diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c index 93a9eb25..24604e29 100644 --- a/WWW/Library/Implementation/HTRules.c +++ b/WWW/Library/Implementation/HTRules.c @@ -19,15 +19,15 @@ */ /* (c) CERN WorldWideWeb project 1990,91. See Copyright.html for details */ -#include "HTRules.h" +#include <HTRules.h> -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> /*#include <stdio.h> included by HTUtils.h -- FM */ -#include "HTFile.h" -#include "HTAAServ.h" /* Access Authorization */ +#include <HTFile.h> +#include <HTAAServ.h> /* Access Authorization */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define LINE_LENGTH 256 diff --git a/WWW/Library/Implementation/HTRules.h b/WWW/Library/Implementation/HTRules.h index 84075244..d19b8a4b 100644 --- a/WWW/Library/Implementation/HTRules.h +++ b/WWW/Library/Implementation/HTRules.h @@ -17,7 +17,7 @@ #define HTRULE_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ typedef enum _HTRuleOp { diff --git a/WWW/Library/Implementation/HTStream.h b/WWW/Library/Implementation/HTStream.h index 72344cd3..5892a1a1 100644 --- a/WWW/Library/Implementation/HTStream.h +++ b/WWW/Library/Implementation/HTStream.h @@ -14,7 +14,7 @@ #define HTSTREAM_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ typedef struct _HTStream HTStream; diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c index 5f358b97..b669c379 100644 --- a/WWW/Library/Implementation/HTString.c +++ b/WWW/Library/Implementation/HTString.c @@ -7,11 +7,11 @@ ** 6 Oct 92 (TBL) Moved WWW_TraceFlag in here to be in library */ #include <ctype.h> -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "LYLeaks.h" -#include "LYStrings.h" +#include <LYLeaks.h> +#include <LYStrings.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTString.h b/WWW/Library/Implementation/HTString.h index 0b2c23dc..25c57002 100644 --- a/WWW/Library/Implementation/HTString.h +++ b/WWW/Library/Implementation/HTString.h @@ -8,7 +8,7 @@ #define HTSTRING_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ extern int WWW_TraceFlag; /* Global flag for all W3 trace */ diff --git a/WWW/Library/Implementation/HTStyle.c b/WWW/Library/Implementation/HTStyle.c index a5e24205..8fc72093 100644 --- a/WWW/Library/Implementation/HTStyle.c +++ b/WWW/Library/Implementation/HTStyle.c @@ -8,10 +8,10 @@ ** translation necessary to ** represent a document. It is a linked list of styles. */ -#include "HTUtils.h" -#include "HTStyle.h" +#include <HTUtils.h> +#include <HTStyle.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTStyle.h b/WWW/Library/Implementation/HTStyle.h index bbab0ea6..ae3e5d54 100644 --- a/WWW/Library/Implementation/HTStyle.h +++ b/WWW/Library/Implementation/HTStyle.h @@ -33,9 +33,9 @@ Overriding this module #define HTStyle_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTAnchor.h" +#include <HTAnchor.h> typedef long int HTFont; /* Dummy definition instead */ diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c index 13897da8..daf37411 100644 --- a/WWW/Library/Implementation/HTTCP.c +++ b/WWW/Library/Implementation/HTTCP.c @@ -16,12 +16,12 @@ ** 16 Jul 95 S. Bjorndahl added kluge to deal with LIBCMU bug */ -#include "HTUtils.h" -#include "tcp.h" /* Defines SHORT_NAMES if necessary */ -#include "HTAccess.h" -#include "HTParse.h" -#include "HTAlert.h" -#include "HTTCP.h" +#include <HTUtils.h> +#include <tcp.h> /* Defines SHORT_NAMES if necessary */ +#include <HTAccess.h> +#include <HTParse.h> +#include <HTAlert.h> +#include <HTTCP.h> #ifdef NSL_FORK #include <signal.h> @@ -51,7 +51,7 @@ PUBLIC int BSDselect PARAMS(( #endif /* SOCKS */ #endif /* SVR4_BSDSELECT */ -#include "LYLeaks.h" +#include <LYLeaks.h> #ifdef SHORT_NAMES #define HTInetStatus HTInStat @@ -637,10 +637,14 @@ PUBLIC int HTParseInet ARGS2( "HTParseInet: Can't find internet node name `%s'.\n", host); } +#ifndef _WINDOWS_NSL FREE(host); +#endif /* _WINDOWS_NSL */ return -1; /* Fail? */ } +#ifndef _WINDOWS_NSL FREE(host); +#endif /* _WINDOWS_NSL */ #if defined(VMS) && defined(CMU_TCP) /* ** In LIBCMU, phost->h_length contains not the length of one address diff --git a/WWW/Library/Implementation/HTTCP.h b/WWW/Library/Implementation/HTTCP.h index b4dab1d6..c7f16dcc 100644 --- a/WWW/Library/Implementation/HTTCP.h +++ b/WWW/Library/Implementation/HTTCP.h @@ -8,9 +8,9 @@ #define HTTCP_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "tcp.h" +#include <tcp.h> #ifdef SHORT_NAMES #define HTInetStatus HTInStat diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index d1354911..996ebd4b 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -6,10 +6,10 @@ ** 28 Apr 1997 AJL,FM Do Proxy Authorisation. */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "HTTP.h" +#include <HTTP.h> #define HTTP_VERSION "HTTP/1.0" @@ -21,19 +21,19 @@ #define LINE_EXTEND_THRESH 256 /* Minimum read size */ #define VERSION_LENGTH 20 /* for returned protocol version */ -#include "HTParse.h" -#include "HTTCP.h" -#include "HTFormat.h" -#include "HTFile.h" +#include <HTParse.h> +#include <HTTCP.h> +#include <HTFormat.h> +#include <HTFile.h> #include <ctype.h> -#include "HTAlert.h" -#include "HTMIME.h" -#include "HTML.h" -#include "HTInit.h" -#include "HTAABrow.h" - -#include "LYGlobalDefs.h" -#include "LYLeaks.h" +#include <HTAlert.h> +#include <HTMIME.h> +#include <HTML.h> +#include <HTInit.h> +#include <HTAABrow.h> + +#include <LYGlobalDefs.h> +#include <LYLeaks.h> /* #define TRACE 1 */ diff --git a/WWW/Library/Implementation/HTTP.h b/WWW/Library/Implementation/HTTP.h index 92f1951c..cd6925f2 100644 --- a/WWW/Library/Implementation/HTTP.h +++ b/WWW/Library/Implementation/HTTP.h @@ -5,7 +5,7 @@ #ifndef HTTP_H #define HTTP_H -#include "HTAccess.h" +#include <HTAccess.h> #ifdef GLOBALREF_IS_MACRO extern GLOBALREF (HTProtocol,HTTP); diff --git a/WWW/Library/Implementation/HTTelnet.c b/WWW/Library/Implementation/HTTelnet.c index 140630e1..3a03eb33 100644 --- a/WWW/Library/Implementation/HTTelnet.c +++ b/WWW/Library/Implementation/HTTelnet.c @@ -13,33 +13,28 @@ ** 2 Feb 93 Split from HTAccess.c. Registration.(TBL) */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> /* Implements: */ -#include "HTTelnet.h" +#include <HTTelnet.h> -#include "HTParse.h" -#include "HTAnchor.h" -#include "HTTP.h" -#include "HTFile.h" +#include <HTParse.h> +#include <HTAnchor.h> +#include <HTTP.h> +#include <HTFile.h> /*#include <errno.h> included by tcp.h -- FM */ /*#include <stdio.h> included by HTUtils.h -- FM */ -#include "HText.h" +#include <HText.h> -#include "HTAccess.h" -#include "HTAlert.h" -#if !defined (VMS) && !defined (_WINDOWS) -#include "../../../userdefs.h" /* for TELNET_COMMAND and RLOGIN_COMMAND */ -#endif /* not VMS */ +#include <HTAccess.h> +#include <HTAlert.h> -#ifdef _WINDOWS /* ../../.. doesn't work for me */ -#include "userdefs.h" /* for TELNET_COMMAND and RLOGIN_COMMAND */ -#endif +#include <userdefs.h> /* for TELNET_COMMAND and RLOGIN_COMMAND */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTTelnet.h b/WWW/Library/Implementation/HTTelnet.h index 4c5de744..b5ce8877 100644 --- a/WWW/Library/Implementation/HTTelnet.h +++ b/WWW/Library/Implementation/HTTelnet.h @@ -6,7 +6,7 @@ #ifndef HTTELNET_H #define HTTELNET_H -#include "HTAccess.h" +#include <HTAccess.h> #ifdef GLOBALREF_IS_MACRO extern GLOBALREF(HTProtocol,HTTelnet); diff --git a/WWW/Library/Implementation/HTUU.c b/WWW/Library/Implementation/HTUU.c index 865315cc..c341c4b8 100644 --- a/WWW/Library/Implementation/HTUU.c +++ b/WWW/Library/Implementation/HTUU.c @@ -34,10 +34,10 @@ ** */ -#include "HTUtils.h" -#include "HTUU.h" +#include <HTUtils.h> +#include <HTUU.h> -#include "LYLeaks.h" +#include <LYLeaks.h> PRIVATE char six2pr[64] = { 'A','B','C','D','E','F','G','H','I','J','K','L','M', diff --git a/WWW/Library/Implementation/HTUU.h b/WWW/Library/Implementation/HTUU.h index 05874e24..9c72a115 100644 --- a/WWW/Library/Implementation/HTUU.h +++ b/WWW/Library/Implementation/HTUU.h @@ -12,7 +12,7 @@ #define HTUU_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ PUBLIC int HTUU_encode PARAMS((unsigned char *bufin, diff --git a/WWW/Library/Implementation/HTUtils.h b/WWW/Library/Implementation/HTUtils.h index 9e7ea323..d96a6cb7 100644 --- a/WWW/Library/Implementation/HTUtils.h +++ b/WWW/Library/Implementation/HTUtils.h @@ -81,7 +81,7 @@ #endif #ifdef _WINDOWS /* SCW */ -#include "windef.h" +#include <windef.h> #define BOOLEAN_DEFINED #define va_arg #include <dos.h> @@ -310,7 +310,7 @@ Sucess (>=0) and failure (<0) codes #define HT_BAD_EOF -12 /* Premature EOF */ -#include "HTString.h" /* String utilities */ +#include <HTString.h> /* String utilities */ #ifndef va_arg #ifdef __STDC__ @@ -330,7 +330,7 @@ Out Of Memory checking for malloc() return: #define __LINE__ "" #endif -#include "LYexit.h" +#include <LYexit.h> #define outofmem(file, func)\ { fprintf(stderr,\ diff --git a/WWW/Library/Implementation/HTVMSUtils.c b/WWW/Library/Implementation/HTVMSUtils.c index 118f9517..ca800517 100644 --- a/WWW/Library/Implementation/HTVMSUtils.c +++ b/WWW/Library/Implementation/HTVMSUtils.c @@ -13,14 +13,14 @@ ** */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTFormat.h" -#include "HTStream.h" -#include "UCDefs.h" -#include "UCMap.h" -#include "UCAux.h" -#include "HTVMSUtils.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTFormat.h> +#include <HTStream.h> +#include <UCDefs.h> +#include <UCMap.h> +#include <UCAux.h> +#include <HTVMSUtils.h> /*#include <stdio.h> included by HTUtils.h -- FM */ /*#include <unixlib.h> included by HTUtils.h -- FM */ #include <ssdef.h> @@ -33,7 +33,7 @@ #include <starlet.h> #include <rmsdef.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} @@ -518,7 +518,7 @@ extern void rewinddir(/* DIR *dirp */); #endif #endif /* not defined for VMS */ -/*** #include "sys_dirent.h" ***/ +/*** #include <sys_dirent.h> ***/ /*** "sys_dirent.h" ***/ struct dirent { #if 0 @@ -700,15 +700,15 @@ long status; return(0); } -#include "HTAnchor.h" -#include "HTParse.h" -#include "HTBTree.h" -#include "HTFile.h" /* For HTFileFormat() */ -#include "HTAlert.h" +#include <HTAnchor.h> +#include <HTParse.h> +#include <HTBTree.h> +#include <HTFile.h> /* For HTFileFormat() */ +#include <HTAlert.h> /* ** Hypertext object building machinery. */ -#include "HTML.h" +#include <HTML.h> #define PUTC(c) (*targetClass.put_character)(target, c) #define PUTS(s) (*targetClass.put_string)(target, s) #define START(e) (*targetClass.start_element)(target, e, 0, 0, -1, 0) diff --git a/WWW/Library/Implementation/HTVMS_WaisProt.c b/WWW/Library/Implementation/HTVMS_WaisProt.c index ee3a51c0..543de7ad 100644 --- a/WWW/Library/Implementation/HTVMS_WaisProt.c +++ b/WWW/Library/Implementation/HTVMS_WaisProt.c @@ -31,12 +31,12 @@ /* This file implements the Z39.50 extensions required for WAIS */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTVMS_WaisUI.h" -#include "HTVMS_WaisProt.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTVMS_WaisUI.h> +#include <HTVMS_WaisProt.h> -#include "LYLeaks.h" +#include <LYLeaks.h> /* very rough estimates of the size of an object */ diff --git a/WWW/Library/Implementation/HTVMS_WaisUI.c b/WWW/Library/Implementation/HTVMS_WaisUI.c index 81c09707..f8f88da3 100644 --- a/WWW/Library/Implementation/HTVMS_WaisUI.c +++ b/WWW/Library/Implementation/HTVMS_WaisUI.c @@ -35,19 +35,19 @@ * */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTVMS_WaisUI.h" -#include "HTVMS_WaisProt.h" -#include "HTTCP.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTVMS_WaisUI.h> +#include <HTVMS_WaisProt.h> +#include <HTTCP.h> /*#include <stdio> included by HTUtils.h -- FM */ #include <string.h> #include <ctype.h> #include <math.h> #include <stdarg.h> -#include "LYexit.h" -#include "LYLeaks.h" +#include <LYexit.h> +#include <LYLeaks.h> void log_write(s) diff --git a/WWW/Library/Implementation/HTWAIS.c b/WWW/Library/Implementation/HTWAIS.c index b4a668ce..627086ab 100644 --- a/WWW/Library/Implementation/HTWAIS.c +++ b/WWW/Library/Implementation/HTWAIS.c @@ -48,22 +48,22 @@ Brewster@think.com */ -#include "HTUtils.h" -#include "tcp.h" -#include "HTParse.h" -#include "HTAccess.h" /* We implement a protocol */ -#include "HTML.h" /* The object we will generate */ -#include "HTWSRC.h" -#include "HTTCP.h" -#include "HTCJK.h" -#include "HTAlert.h" +#include <HTUtils.h> +#include <tcp.h> +#include <HTParse.h> +#include <HTAccess.h> /* We implement a protocol */ +#include <HTML.h> /* The object we will generate */ +#include <HTWSRC.h> +#include <HTTCP.h> +#include <HTCJK.h> +#include <HTAlert.h> /* From WAIS ** --------- */ #ifdef VMS -#include "HTVMS_WaisUI.h" -#include "HTVMS_WaisProt.h" +#include <HTVMS_WaisUI.h> +#include <HTVMS_WaisProt.h> #else #include <ui.h> #endif /* VMS */ @@ -76,7 +76,7 @@ /* FROM WWW ** -------- */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTWAIS.h b/WWW/Library/Implementation/HTWAIS.h index 4aa885dc..fe203ef9 100644 --- a/WWW/Library/Implementation/HTWAIS.h +++ b/WWW/Library/Implementation/HTWAIS.h @@ -26,9 +26,9 @@ #define HTWAIS_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTAccess.h" +#include <HTAccess.h> #ifdef GLOBALREF_IS_MACRO extern GLOBALREF(HTProtocol, HTWAIS); diff --git a/WWW/Library/Implementation/HTWSRC.c b/WWW/Library/Implementation/HTWSRC.c index e7f15dad..baf759c9 100644 --- a/WWW/Library/Implementation/HTWSRC.c +++ b/WWW/Library/Implementation/HTWSRC.c @@ -8,16 +8,16 @@ ** 3 June 93 Bug fix: Won't crash if no description */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "HTWSRC.h" +#include <HTWSRC.h> -#include "HTML.h" -#include "HTParse.h" +#include <HTML.h> +#include <HTParse.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTWSRC.h b/WWW/Library/Implementation/HTWSRC.h index 9241b321..cde25467 100644 --- a/WWW/Library/Implementation/HTWSRC.h +++ b/WWW/Library/Implementation/HTWSRC.h @@ -12,10 +12,10 @@ #define HTWSRC_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTFormat.h" +#include <HTFormat.h> extern char from_hex PARAMS((char c)); diff --git a/WWW/Library/Implementation/HTWriter.c b/WWW/Library/Implementation/HTWriter.c index f803920f..601bdb0a 100644 --- a/WWW/Library/Implementation/HTWriter.c +++ b/WWW/Library/Implementation/HTWriter.c @@ -2,16 +2,16 @@ ** =========== ** */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> -#include "HTWriter.h" +#include <HTWriter.h> #define BUFFER_SIZE 4096 /* Tradeoff */ /*#include <stdio.h> included by HTUtils.h -- FM */ -#include "LYLeaks.h" +#include <LYLeaks.h> #define FREE(x) if (x) {free(x); x = NULL;} diff --git a/WWW/Library/Implementation/HTWriter.h b/WWW/Library/Implementation/HTWriter.h index 9fa5f8c6..c5306351 100644 --- a/WWW/Library/Implementation/HTWriter.h +++ b/WWW/Library/Implementation/HTWriter.h @@ -16,7 +16,7 @@ #ifndef HTWRITE_H #define HTWRITE_H -#include "HTStream.h" +#include <HTStream.h> extern HTStream * HTWriter_new PARAMS((int soc)); diff --git a/WWW/Library/Implementation/HText.h b/WWW/Library/Implementation/HText.h index 64000eab..9a028d87 100644 --- a/WWW/Library/Implementation/HText.h +++ b/WWW/Library/Implementation/HText.h @@ -12,10 +12,10 @@ */ #ifndef HTEXT_H #define HTEXT_H -#include "HTAnchor.h" -#include "HTStyle.h" -#include "HTStream.h" -#include "SGML.h" +#include <HTAnchor.h> +#include <HTStyle.h> +#include <HTStream.h> +#include <SGML.h> #ifdef SHORT_NAMES #define HTMainText HTMaText diff --git a/WWW/Library/Implementation/LYLeaks.h b/WWW/Library/Implementation/LYLeaks.h index b181cb7f..91bfbaac 100644 --- a/WWW/Library/Implementation/LYLeaks.h +++ b/WWW/Library/Implementation/LYLeaks.h @@ -42,7 +42,7 @@ ** Required includes */ #include <stdlib.h> -#include "HTUtils.h" +#include <HTUtils.h> /* ** Constant defines diff --git a/WWW/Library/Implementation/LYexit.h b/WWW/Library/Implementation/LYexit.h index 7007d615..93bc8070 100644 --- a/WWW/Library/Implementation/LYexit.h +++ b/WWW/Library/Implementation/LYexit.h @@ -20,7 +20,7 @@ * Required includes */ #include <stdlib.h> -#include "HTUtils.h" +#include <HTUtils.h> /* * Constant defines diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c index 713bb905..91c1b00d 100644 --- a/WWW/Library/Implementation/SGML.c +++ b/WWW/Library/Implementation/SGML.c @@ -9,8 +9,8 @@ ** 6 Feb 93 Binary seraches used. Intreface modified. */ -#include "HTUtils.h" -#include "tcp.h" /* For FROMASCII */ +#include <HTUtils.h> +#include <tcp.h> /* For FROMASCII */ /* Remove the following to disable the experimental HTML DTD parsing. Currently only used in this source file. - kw */ @@ -19,19 +19,19 @@ #define EXTENDED_HTMLDTD #endif -#include "SGML.h" -#include "HTMLDTD.h" -#include "HTCJK.h" -#include "UCMap.h" -#include "UCDefs.h" -#include "UCAux.h" +#include <SGML.h> +#include <HTMLDTD.h> +#include <HTCJK.h> +#include <UCMap.h> +#include <UCDefs.h> +#include <UCAux.h> #include <ctype.h> /*#include <stdio.h> included in HTUtils.h -- FM */ -#include "HTChunk.h" +#include <HTChunk.h> -#include "LYCharSets.h" -#include "LYLeaks.h" +#include <LYCharSets.h> +#include <LYLeaks.h> #define INVALID (-1) @@ -242,7 +242,7 @@ extern BOOL minimal_comments; extern BOOL soft_dquotes; #ifdef USE_COLOR_STYLE -#include "AttrList.h" +#include <AttrList.h> extern char class_string[TEMPSTRINGSIZE]; int current_is_class=0; #endif diff --git a/WWW/Library/Implementation/SGML.h b/WWW/Library/Implementation/SGML.h index b30a8230..fd0bf759 100644 --- a/WWW/Library/Implementation/SGML.h +++ b/WWW/Library/Implementation/SGML.h @@ -21,10 +21,10 @@ #define SGML_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* HTUTILS_H */ -#include "HTStream.h" -#include "HTAnchor.h" +#include <HTStream.h> +#include <HTAnchor.h> /* diff --git a/WWW/Library/Implementation/UCAux.h b/WWW/Library/Implementation/UCAux.h index b350e617..a1e3df46 100644 --- a/WWW/Library/Implementation/UCAux.h +++ b/WWW/Library/Implementation/UCAux.h @@ -26,7 +26,7 @@ struct _UCTransParams typedef struct _UCTransParams UCTransParams; #ifndef UCDEFS_H -#include "UCDefs.h" +#include <UCDefs.h> #endif /* UCDEFS_H */ extern void UCSetTransParams PARAMS(( @@ -47,7 +47,7 @@ extern void UCSetBoxChars PARAMS(( int hori_in)); #ifndef HTSTREAM_H -#include "HTStream.h" +#include <HTStream.h> #endif /* HTSTREAM_H */ typedef void putc_func_t PARAMS(( @@ -55,7 +55,7 @@ typedef void putc_func_t PARAMS(( char ch)); #ifndef UCMAP_H -#include "UCMap.h" +#include <UCMap.h> #endif /* UCMAP_H */ extern BOOL UCPutUtf8_charstring PARAMS(( diff --git a/WWW/Library/Implementation/crypt.c b/WWW/Library/Implementation/crypt.c index ffc466c7..1a01711c 100644 --- a/WWW/Library/Implementation/crypt.c +++ b/WWW/Library/Implementation/crypt.c @@ -24,12 +24,12 @@ */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif -#include "ufc-crypt.h" +#include <ufc-crypt.h> -#include "LYLeaks.h" +#include <LYLeaks.h> #ifdef _UFC_32_ diff --git a/WWW/Library/Implementation/crypt_util.c b/WWW/Library/Implementation/crypt_util.c index 9ed7e95d..bdec6f7b 100644 --- a/WWW/Library/Implementation/crypt_util.c +++ b/WWW/Library/Implementation/crypt_util.c @@ -24,7 +24,7 @@ */ #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif #ifdef DEBUG @@ -36,18 +36,18 @@ #endif #ifndef DOS -#include "patchlevel.h" -#include "ufc-crypt.h" +#include <patchlevel.h> +#include <ufc-crypt.h> #else /* * Thanks to greg%wind@plains.NoDak.edu (Greg W. Wettstein) * for DOS patches */ -#include "pl.h" -#include "ufc.h" +#include <pl.h> +#include <ufc.h> #endif -#include "LYLeaks.h" +#include <LYLeaks.h> static char patchlevel_str[] = PATCHLEVEL; diff --git a/WWW/Library/Implementation/getline.c b/WWW/Library/Implementation/getline.c index 7f6ff038..4ee2e744 100644 --- a/WWW/Library/Implementation/getline.c +++ b/WWW/Library/Implementation/getline.c @@ -22,11 +22,11 @@ Cambridge, MA 02139, USA. */ * <getline.c> */ -#include "HTUtils.h" -#include "tcp.h" +#include <HTUtils.h> +#include <tcp.h> #include <stddef.h> -#include "LYLeaks.h" +#include <LYLeaks.h> /* Read up to (and including) a newline from STREAM into *LINEPTR (and null-terminate it). *LINEPTR is a pointer returned from malloc (or diff --git a/WWW/Library/Implementation/getpass.c b/WWW/Library/Implementation/getpass.c index a7f0de7b..0e8ffdfa 100644 --- a/WWW/Library/Implementation/getpass.c +++ b/WWW/Library/Implementation/getpass.c @@ -22,14 +22,14 @@ Cambridge, MA 02139, USA. */ * <getpass.c> */ -#include "HTUtils.h" +#include <HTUtils.h> /*#include <stdio.h> included by HTUtils.h -- FM */ #include <descrip.h> #include <psldef.h> #include <iodef.h> #include <starlet.h> -#include "LYLeaks.h" +#include <LYLeaks.h> PUBLIC char * getpass ARGS1(CONST char *, prompt) { diff --git a/WWW/Library/Implementation/tcp.h b/WWW/Library/Implementation/tcp.h index 482ff28d..ccd4ccf8 100644 --- a/WWW/Library/Implementation/tcp.h +++ b/WWW/Library/Implementation/tcp.h @@ -30,7 +30,7 @@ #define TCP_H #ifndef HTUTILS_H -#include "HTUtils.h" +#include <HTUtils.h> #endif /* !HTUTILS_H */ /* @@ -68,30 +68,35 @@ typedef struct sockaddr_in SockA; /* See netinet/in.h */ #ifndef VMS #include <sys/types.h> -#if HAVE_DIRENT_H +#if defined(__DJGPP__) || defined(__BORLANDC__) +#define HAVE_DIRENT_H +#undef HAVE_SYS_FILIO_H +#endif /* DJGPP or __BORLANDC__ */ + +#ifdef HAVE_DIRENT_H # include <dirent.h> # define D_NAMLEN(dirent) strlen((dirent)->d_name) # define STRUCT_DIRENT struct dirent #else # define D_NAMLEN(dirent) (dirent)->d_namlen # define STRUCT_DIRENT struct direct -# if HAVE_SYS_NDIR_H +# ifdef HAVE_SYS_NDIR_H # include <sys/ndir.h> # endif -# if HAVE_SYS_DIR_H +# ifdef HAVE_SYS_DIR_H # include <sys/dir.h> # endif -# if HAVE_NDIR_H +# ifdef HAVE_NDIR_H # include <ndir.h> # endif #endif /* HAVE_DIRENT_H */ #endif /* !VMS */ -#if TIME_WITH_SYS_TIME +#ifdef TIME_WITH_SYS_TIME # include <sys/time.h> # include <time.h> #else -# if HAVE_SYS_TIME_H +# ifdef HAVE_SYS_TIME_H # include <sys/time.h> # else # include <time.h> @@ -105,15 +110,15 @@ typedef struct sockaddr_in SockA; /* See netinet/in.h */ #define unix #endif /* AIX */ -#if HAVE_FCNTL_H +#ifdef HAVE_FCNTL_H #include <fcntl.h> #else -#if HAVE_SYS_FCNTL_H +#ifdef HAVE_SYS_FCNTL_H #include <sys/fcntl.h> #endif #endif -#if HAVE_STRING_H +#ifdef HAVE_STRING_H #include <string.h> /* For bzero etc */ #endif /* HAVE_STRING_H */ @@ -136,9 +141,9 @@ IBM-PC running Windows NT #ifdef _WINDOWS #define _WINDOWS_NSL -#include "fcntl.h" /* For HTFile.c */ -#include "sys\types.h" /* For HTFile.c */ -#include "sys\stat.h" /* For HTFile.c */ +#include <fcntl.h> /* For HTFile.c */ +#include <sys\types.h> /* For HTFile.c */ +#include <sys\stat.h> /* For HTFile.c */ #undef NETREAD #undef NETWRITE #undef NETCLOSE @@ -348,10 +353,10 @@ struct timeval { #include <types.h> #include <errno.h> #include <time.h> -#include "types.h" /* for socket.h */ -#include "socket.h" -#include "dn" -#include "dnetdb" +#include <types.h> /* for socket.h */ +#include <socket.h> +#include <dn> +#include <dnetdb> /* #include "vms.h" */ #define TCP_INCLUDES_DONE #endif /* DECNET */ @@ -485,11 +490,11 @@ struct timeval { #define NETCLOSE close_s #endif -#if HAVE_UNISTD_H +#ifdef HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ -#if HAVE_SYS_FILIO_H +#ifdef HAVE_SYS_FILIO_H #include <sys/filio.h> #endif /* HAVE_SYS_FILIO_H */ @@ -508,7 +513,7 @@ Regular BSD unix versions */ #ifndef INCLUDES_DONE #include <sys/types.h> -#if HAVE_STRING_H +#ifdef HAVE_STRING_H #include <string.h> #endif /* HAVE_STRING_H */ #include <errno.h> /* independent */ diff --git a/WWW/Library/djgpp/CommonMakefile b/WWW/Library/djgpp/CommonMakefile index 1fdaf314..82ec133d 100644 --- a/WWW/Library/djgpp/CommonMakefile +++ b/WWW/Library/djgpp/CommonMakefile @@ -112,7 +112,7 @@ HFILES = $(CMN)HTParse.h $(CMN)HTAccess.h $(CMN)HTTP.h $(CMN)HTFile.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)HTString.h $(CMN)HTRules.h \ $(CMN)HTFormat.h $(CMN)HTInit.h \ $(CMN)HTMIME.h $(CMN)HTHistory.h $(CMN)HTNews.h \ $(CMN)HTGopher.h \ @@ -325,7 +325,7 @@ $(LOB)/HTAAServ.o : $(OE) $(CMN)HTAAServ.c $(CMN)HTAAServ.h \ $(LOB)/HTAABrow.o : $(OE) $(CMN)HTAABrow.c $(CMN)HTAABrow.h \ $(CMN)HTAAUtil.h $(CMN)HTUU.h \ $(CMN)HTUtils.h $(CMN)HTString.h \ - $(CMN)HTParse.h $(CMN)HTList.h $(CMN)HTAlert.h \ + $(CMN)HTParse.h $(CMN)HTList.h \ $(CMN)HTAssoc.h $(CC) -c -o $@ $(CFLAGS2) $(CMN)HTAABrow.c diff --git a/WWW/Library/djgpp/makefile b/WWW/Library/djgpp/makefile index d7272e45..87a9a103 100644 --- a/WWW/Library/djgpp/makefile +++ b/WWW/Library/djgpp/makefile @@ -7,8 +7,11 @@ WWW_MACH = djgpp # The ASIS repository's name for the machine we are on #ASIS_MACH = hardware/os -CFLAGS = -O3 -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDEBUG -I../../../djgpp/tcplib/include -I../../../djgpp/tcplib/include/tcp \ --I../../../src -I../../.. +CFLAGS = -O3 -DUSE_ZLIB -DDOSPATH -DNOUSERS -DDEBUG \ +-I../../../djgpp/tcplib/include \ +-I../../../djgpp/tcplib/include/tcp \ +-I../../../src \ +-I../../.. LFLAGS = CC = gcc diff --git a/WWW/Library/unix/makefile.in b/WWW/Library/unix/makefile.in index 94918497..3aae2df5 100644 --- a/WWW/Library/unix/makefile.in +++ b/WWW/Library/unix/makefile.in @@ -20,7 +20,12 @@ LYFLAGS = # FIXME: set in parent makefile CC = @CC@ DEFS = @DEFS@ CPPFLAGS = @CPPFLAGS@ -CPPOPTS = $(DEFS) $(CPPFLAGS) $(LYFLAGS) -I../../.. -I../../../src -I$(top_srcdir) -I$(top_srcdir)/src +CPPOPTS = $(DEFS) $(CPPFLAGS) $(LYFLAGS) \ + -I../../.. \ + -I../../../src \ + -I$(top_srcdir) \ + -I$(top_srcdir)/src \ + -I$(top_srcdir)/WWW/Library/Implementation LY_CFLAGS = @CFLAGS@ CFLAGS = $(CPPOPTS) $(LY_CFLAGS) diff --git a/aclocal.m4 b/aclocal.m4 index fe75e1c2..dfd05a1a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -39,7 +39,7 @@ AC_DEFUN([CF_ALT_CHAR_SET], AC_MSG_CHECKING([if curses supports alternate-character set]) AC_CACHE_VAL(cf_cv_alt_char_set,[ AC_TRY_LINK([ -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> ],[chtype x = acs_map['l']; acs_map['m'] = 0], [cf_cv_alt_char_set=yes], [cf_cv_alt_char_set=no])]) @@ -126,7 +126,7 @@ AC_DEFUN([CF_BOOL_DEFS], AC_MSG_CHECKING(if TRUE/FALSE are defined) AC_CACHE_VAL(cf_cv_bool_defs,[ AC_TRY_COMPILE([ -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> #include <stdio.h>],[int x = TRUE, y = FALSE], [cf_cv_bool_defs=yes], [cf_cv_bool_defs=no])]) @@ -346,7 +346,7 @@ AC_MSG_CHECKING([for curses performance tradeoff]) AC_CACHE_VAL(cf_cv_curs_performance,[ cf_cv_curs_performance=no AC_TRY_COMPILE([ -#include <$cf_cv_ncurses_header>],[ +#include <${cf_cv_ncurses_header-curses.h}>],[ #if defined(wbkgdset) && defined(clearok) && defined(getbkgd) int x = ERR; #else @@ -355,7 +355,7 @@ AC_CACHE_VAL(cf_cv_curs_performance,[ ],[ AC_TRY_COMPILE([ #define CURS_PERFORMANCE -#include <$cf_cv_ncurses_header>],[ +#include <${cf_cv_ncurses_header-curses.h}>],[ #if defined(wbkgdset) && defined(clearok) && defined(getbkgd) int x = ; /* force an error */ #else @@ -427,7 +427,7 @@ AC_DEFUN([CF_FANCY_CURSES], AC_MSG_CHECKING(if curses supports fancy attributes) AC_CACHE_VAL(cf_cv_fancy_curses,[ AC_TRY_LINK([ -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> ], [attrset(A_UNDERLINE|A_BOLD|A_REVERSE); wattrset(stdscr, A_BLINK|A_DIM); @@ -818,7 +818,7 @@ if test "$cf_cv_ncurses_version" != no ; then AC_MSG_CHECKING(for obsolete/broken version of ncurses) AC_CACHE_VAL(cf_cv_ncurses_broken,[ AC_TRY_COMPILE([ -#include <$cf_cv_ncurses_header>],[ +#include <${cf_cv_ncurses_header-curses.h}>],[ #if defined(NCURSES_VERSION) && defined(wgetbkgd) make an error #else @@ -1401,7 +1401,7 @@ AC_DEFUN([CF_TTYTYPE], [ AC_MSG_CHECKING(if ttytype is declared in curses library) AC_CACHE_VAL(cf_cv_have_ttytype,[ - AC_TRY_LINK([#include <$cf_cv_ncurses_header>], + AC_TRY_LINK([#include <${cf_cv_ncurses_header-curses.h}>], [char *x = &ttytype[1]; *x = 1], [cf_cv_have_ttytype=yes], [cf_cv_have_ttytype=no]) diff --git a/build.com b/build.com index bfec6e39..41ecb69f 100644 --- a/build.com +++ b/build.com @@ -196,7 +196,7 @@ $ v1 = f$verify(1) $! DECC: $ cc := cc/decc/prefix=all/nomember'cc_opts'- /DEFINE=(DEBUG,ACCESS_AUTH,'option''extra',__VMS_CURSES)- - /INCLUDE=([-],[-.WWW.Library.Implementation],[.chrtrans]) + /INCLUDE=([],[-],[-.WWW.Library.Implementation],[.chrtrans]) $ v1 = 'f$verify(0)' $ ELSE $ if option .eqs. "UCX" then optfile = "UCXOLB" @@ -208,7 +208,7 @@ $ v1 = f$verify(1) $! GNUC: $ cc := gcc'cc_opts' - /DEFINE=(DEBUG,ACCESS_AUTH,'option''extra')- - /INCLUDE=([-],[-.WWW.Library.Implementation],[.chrtrans]) + /INCLUDE=([],[-],[-.WWW.Library.Implementation],[.chrtrans]) $ v1 = 'f$verify(0)' $ ELSE $ compiler := "VAXC" @@ -216,7 +216,7 @@ $ v1 = f$verify(1) $! VAXC: $ cc := cc'cc_opts' - /DEFINE=(DEBUG,ACCESS_AUTH,'option''extra')- - /INCLUDE=([-],[-.WWW.Library.Implementation],[.chrtrans]) + /INCLUDE=([],[-],[-.WWW.Library.Implementation],[.chrtrans]) $ v1 = 'f$verify(0)' $ ENDIF $ ENDIF diff --git a/configure b/configure index beda53fa..b31e4ed4 100755 --- a/configure +++ b/configure @@ -1140,17 +1140,17 @@ CFLAGS=`echo ${CFLAGS} | sed -e 's/-O[1-9]\? //' -e 's/-O[1-9]\?$//'` esac else case $host_os in - ultrix*|osf*) #(vi + osf*) #(vi + CFLAGS="$CFLAGS -std1" CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'` ;; *) - CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'` + CFLAGS=`echo ${CFLAGS} | sed -e 's/-g //' -e 's/-g$//'` ;; esac fi - if test -n "$GCC" then echo $ac_n "checking if you want to turn on gcc warnings""... $ac_c" 1>&6 @@ -3763,7 +3763,7 @@ else #line 3764 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { #if defined(wbkgdset) && defined(clearok) && defined(getbkgd) @@ -3782,7 +3782,7 @@ if { (eval echo configure:3778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; #include "confdefs.h" #define CURS_PERFORMANCE -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { #if defined(wbkgdset) && defined(clearok) && defined(getbkgd) @@ -6282,7 +6282,7 @@ cat > conftest.$ac_ext <<EOF #line 6283 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> #include <stdio.h> int main() { int x = TRUE, y = FALSE @@ -6678,7 +6678,7 @@ else #line 6679 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { chtype x = acs_map['l']; acs_map['m'] = 0 @@ -6713,7 +6713,7 @@ else #line 6714 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { attrset(A_UNDERLINE|A_BOLD|A_REVERSE); @@ -6829,7 +6829,7 @@ cat > conftest.$ac_ext <<EOF #line 6830 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { #if defined(NCURSES_VERSION) && defined(wgetbkgd) @@ -7006,7 +7006,7 @@ else cat > conftest.$ac_ext <<EOF #line 7008 "configure" #include "confdefs.h" -#include <$cf_cv_ncurses_header> +#include <${cf_cv_ncurses_header-curses.h}> int main() { char *x = &ttytype[1]; *x = 1 ; return 0; } diff --git a/configure.in b/configure.in index 49051ce8..1d69e632 100644 --- a/configure.in +++ b/configure.in @@ -56,17 +56,17 @@ if test "$with_debug" = "yes" ; then esac else case $host_os in - ultrix*|osf*) #(vi + osf*) #(vi + CFLAGS="$CFLAGS -std1" CF_STRIP_G_OPT(CFLAGS) ;; *) - CF_STRIP_G_OPT(CFLAGS) + CF_STRIP_G_OPT(CFLAGS) ;; esac fi - if test -n "$GCC" then AC_MSG_CHECKING(if you want to turn on gcc warnings) diff --git a/lynx.cfg b/lynx.cfg index 5c73de82..500da747 100644 --- a/lynx.cfg +++ b/lynx.cfg @@ -370,6 +370,14 @@ DEFAULT_INDEX_FILE:http://www.ncsa.uiuc.edu/SDG/Software/Mosaic/MetaIndex.html # #SHOW_CURSOR:FALSE +# VERBOSE_IMAGES controls whether or not Lynx replaces the [LINK], [INLINE] and +# [IMAGE] comments (for images without ALT) with filenames of these images. +# This is extremely useful because now we can determine immediately what images +# are just decorations (button.gif, line.gif) and what images are important. +# +# If this option is set here, it will override the setting in userdefs.h. +#VERBOSE_IMAGES:FALSE + # If BOLD_HEADERS is set to TRUE the HT_BOLD default style will be acted # upon for <H1> through <H6> headers. The compilation default is FALSE # (only the indentation styles are acted upon, but see BOLD_H1, below). 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. diff --git a/userdefs.h b/userdefs.h index ee9e40de..35dcc4d6 100644 --- a/userdefs.h +++ b/userdefs.h @@ -868,6 +868,16 @@ #define SHOW_CURSOR FALSE /****************************** +* VERBOSE_IMAGES controls whether or not Lynx replaces the [LINK], [INLINE] and +* [IMAGE] comments (for images without ALT) with filenames of these images. +* This is extremely useful because now we can determine immediately what images +* are just decorations (button.gif, line.gif) and what images are important. +* +* The default defined here can be changed in lynx.cfg. +*/ +#define VERBOSE_IMAGES FALSE + +/****************************** * BOXVERT and BOXHORI control the layout of popup menus. Set to 0 if your * curses supports line-drawing characters, set to '*' or any other character * to not use line-drawing (e.g., '|' for vertical and '-' for horizontal). @@ -1192,7 +1202,7 @@ * the version definition with the Project Version on checkout. Just * ignore it. - kw */ /* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */ -#define LYNX_VERSION "2.8.1dev.2" +#define LYNX_VERSION "2.8.1dev.4" #ifndef MAXINT #define MAXINT 2147483647 /* max integer */ @@ -1214,7 +1224,7 @@ #define MAXCHARSETSP 61 /* always one more than MAXCHARSETS */ /* Win32 may support more, but old win16 helper apps may not. */ -#if defined(__DJGPP__) && defined(_WINDOWS) +#if defined(__DJGPP__) || defined(_WINDOWS) #define FNAMES_8_3 #endif @@ -1234,6 +1244,9 @@ #else #ifdef DOSPATH +/* Something has to be defined for this or we don't compile. */ +#define SYSTEM_MAIL "sendmail" +#define SYSTEM_MAIL_FLAGS "-t -oi" /* ** Following executables may be sought from your PATH at run-time. ** To get those programs look for GNU-port stuff elsewhere. |