diff options
author | Thomas E. Dickey <dickey@invisible-island.net> | 2008-01-07 23:51:16 -0500 |
---|---|---|
committer | Thomas E. Dickey <dickey@invisible-island.net> | 2008-01-07 23:51:16 -0500 |
commit | 92e120361baf8d55566015fe7bf09ac91f06a6e6 (patch) | |
tree | f39737c1ee6ee1c7e174df97e978b33c11c78238 | |
parent | 297adfacb3d8f416878b4abff8db35df6366aaa8 (diff) | |
download | lynx-snapshots-92e120361baf8d55566015fe7bf09ac91f06a6e6.tar.gz |
snapshot of project "lynx", label v2-8-7dev_7c
-rw-r--r-- | CHANGES | 10 | ||||
-rw-r--r-- | WWW/Library/Implementation/HTTP.c | 13 | ||||
-rw-r--r-- | aclocal.m4 | 19 | ||||
-rw-r--r-- | config.hin | 4 | ||||
-rw-r--r-- | lynx.man | 4 | ||||
-rw-r--r-- | samples/home.htm | 9 | ||||
-rw-r--r-- | src/LYMain.c | 14 | ||||
-rw-r--r-- | src/LYUtils.c | 4 | ||||
-rw-r--r-- | src/LYrcFile.c | 10 | ||||
-rw-r--r-- | src/UCAuto.c | 3 | ||||
-rw-r--r-- | src/chrtrans/makeuctb.c | 15 | ||||
-rw-r--r-- | userdefs.h | 57 |
12 files changed, 101 insertions, 61 deletions
diff --git a/CHANGES b/CHANGES index d4a7fa60..7ef5972b 100644 --- a/CHANGES +++ b/CHANGES @@ -1,9 +1,17 @@ --- $LynxId: CHANGES,v 1.248 2008/01/03 01:16:19 Joey.Schulze Exp $ +-- $LynxId: CHANGES,v 1.250 2008/01/06 20:35:55 Thorsten.Glaser Exp $ =============================================================================== Changes since Lynx 2.8 release =============================================================================== 2007-??-?? (2.8.7dev.8) +* several small changes to configure script to work with MirBSD build + environment -TG +* show progress message in X509 callback -TG +* modify definition of lynxrc and cookies files in LYMain.c and LYrcFile.c to + make it simpler for build script to override -TD +* reviewed patches at + http://www.mirbsd.org/cvs.cgi/ports/www/lynx/patches/ + improved buffer allocation limits in makeuctb.c -TD * add support for the X.509 extension subjectAltName using GNUTLS -Joey Schulze * add SSL_CERT_FILE to lynx.cfg -Joey Schulze * fix spelling error in HTAccess.h comment (report by Paul de Weerd). diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c index bf8ddf29..199ad876 100644 --- a/WWW/Library/Implementation/HTTP.c +++ b/WWW/Library/Implementation/HTTP.c @@ -1,5 +1,5 @@ /* - * $LynxId: HTTP.c,v 1.89 2008/01/03 01:05:46 Joey.Schulze Exp $ + * $LynxId: HTTP.c,v 1.90 2008/01/06 19:50:35 tom Exp $ * * HyperText Tranfer Protocol - Client implementation HTTP.c * ========================== @@ -79,6 +79,15 @@ static int HTSSLCallback(int preverify_ok, X509_STORE_CTX * x509_ctx GCC_UNUSED) char *msg = NULL; int result = 1; +#ifdef USE_X509_SUPPORT + HTSprintf0(&msg, + gettext("SSL callback:%s, preverify_ok=%d, ssl_okay=%d"), + X509_verify_cert_error_string(X509_STORE_CTX_get_error(x509_ctx)), + preverify_ok, ssl_okay); + _HTProgress(msg); + FREE(msg); +#endif + if (!(preverify_ok || ssl_okay || ssl_noprompt)) { #ifdef USE_X509_SUPPORT HTSprintf0(&msg, SSL_FORCED_PROMPT, @@ -439,7 +448,7 @@ static BOOL acceptEncoding(int code) } #ifdef USE_SSL -static void show_cert_issuer(X509 * peer_cert) +static void show_cert_issuer(X509 * peer_cert GCC_UNUSED) { #if defined(USE_OPENSSL_INCL) char ssl_dn[1024]; diff --git a/aclocal.m4 b/aclocal.m4 index d3a0fd30..07397170 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,11 +1,11 @@ -dnl $LynxId: aclocal.m4,v 1.121 2007/07/30 23:23:37 tom Exp $ +dnl $LynxId: aclocal.m4,v 1.122 2008/01/06 20:43:00 Thorsten.Glaser Exp $ dnl Macros for auto-configure script. dnl by T.E.Dickey <dickey@invisible-island.net> dnl and Jim Spath <jspath@mail.bcpl.lib.md.us> dnl and Philippe De Muyter <phdm@macqel.be> dnl dnl Created: 1997/1/28 -dnl Updated: 2007/07/27 +dnl Updated: 2008/01/06 dnl dnl The autoconf used in Lynx development is GNU autoconf 2.13 or 2.52, patched dnl by Thomas Dickey. See your local GNU archives, and this URL: @@ -1400,14 +1400,14 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_SSL_X509 version: 2 updated: 2007/07/30 19:12:03 +dnl CF_CHECK_SSL_X509 version: 3 updated: 2008/01/06 14:56:47 dnl ----------------- dnl Check for X509 support in the SSL library. AC_DEFUN([CF_CHECK_SSL_X509],[ AC_MSG_CHECKING(for X509 support) AC_TRY_LINK(CF__SSL_HEAD [ #include <openssl/x509.h>], - [X509_verify_cert_error_string(X509_STORE_CTX_get_error(X509_STORE_CTX *0))], + [X509_verify_cert_error_string(X509_STORE_CTX_get_error(NULL))], [cf_x509_support=yes], [cf_x509_support=no]) AC_MSG_RESULT($cf_x509_support) @@ -1417,16 +1417,19 @@ if test "$cf_x509_support" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CHECK_TYPE version: 1 updated: 2005/01/01 12:49:48 +dnl CF_CHECK_TYPE version: 2 updated: 2008/01/06 14:56:47 dnl ------------- dnl Add a 3rd parameter to AC_CHECK_TYPE, working around autoconf 2.5x's dnl deliberate incompatibility. dnl $1 = name of type to check for dnl $2 = default type dnl $3 = additional #include's and related preprocessor lines. +ifdef([m4_HAS_AC_CT_FOURARGS], [m4_undefine([m4_HAS_AC_CT_FOURARGS])])dnl +ifelse(m4_PACKAGE_VERSION, [fnord_acsalt], [], +[ifdef([m4_version_compare],[m4_define([m4_HAS_AC_CT_FOURARGS])])])dnl AC_DEFUN([CF_CHECK_TYPE], [ -ifdef([m4_version_compare],[ +ifdef([m4_HAS_AC_CT_FOURARGS],[ AC_CHECK_TYPE([$1],ac_cv_type_$1=yes,ac_cv_type_$1=no,[$3]) ],[ AC_MSG_CHECKING(for $1) @@ -4212,7 +4215,7 @@ define([CF_SRAND_PARSE],[ esac ])dnl dnl --------------------------------------------------------------------------- -dnl CF_SSL version: 11 updated: 2007/07/29 12:32:41 +dnl CF_SSL version: 12 updated: 2008/01/06 14:56:47 dnl ------ dnl Check for ssl library dnl $1 = the [optional] directory in which the library may be found @@ -4246,11 +4249,11 @@ AC_DEFUN([CF_SSL],[ esac fi - CF_CHECK_SSL_X509 if test -n "$cf_cv_library_path_ssl" ; then CF_ADD_LIBDIR($cf_cv_library_path_ssl) fi LIBS="-lssl -lcrypto $LIBS" + CF_CHECK_SSL_X509 fi ])dnl dnl --------------------------------------------------------------------------- diff --git a/config.hin b/config.hin index 6b18ff94..91826642 100644 --- a/config.hin +++ b/config.hin @@ -1,5 +1,5 @@ /* - * $LynxId: config.hin,v 1.98 2007/08/02 20:04:37 tom Exp $ + * $LynxId: config.hin,v 1.99 2008/01/06 20:33:15 tom Exp $ * vile:cmode * * The configure script translates "config.hin" into "lynx_cfg.h" @@ -176,7 +176,7 @@ #undef HAVE___ARGZ_COUNT /* AM_GNU_GETTEXT */ #undef HAVE___ARGZ_NEXT /* AM_GNU_GETTEXT */ #undef HAVE___ARGZ_STRINGIFY /* AM_GNU_GETTEXT */ -#undef ICONV_CONST /* AM_ICONV */ +#undef ICONV_CONST #undef IGNORE_CTRL_C /* FIXME: make tests? */ #undef INCLUDE_PROTOTYPES /* CF_SOCKS5 */ #undef INSTALL_ARGS /* CF_PATH_PROG(install) */ diff --git a/lynx.man b/lynx.man index f4f36cca..ef26af3d 100644 --- a/lynx.man +++ b/lynx.man @@ -1,4 +1,4 @@ -.\" $LynxId: lynx.man,v 1.75 2007/07/01 23:42:16 tom Exp $ +.\" $LynxId: lynx.man,v 1.76 2008/01/06 17:04:42 tom Exp $ .nr N -1 .nr D 5 .TH LYNX 1 @@ -371,6 +371,8 @@ Lynx was compiled with local execution enabled). .B \-lss\fR=\fIFILENAME specify filename containing color-style information. The default is lynx.lss. +If you give an empty filename, \fBlynx\fP uses a built-in monochrome +scheme which imitates the non-color-style configuration. .TP .B \-mime_header prints the MIME header of a fetched document along with its diff --git a/samples/home.htm b/samples/home.htm index 864642ee..b2628215 100644 --- a/samples/home.htm +++ b/samples/home.htm @@ -1,11 +1,14 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> +<!-- + $LynxId: home.htm,v 1.4 2008/01/06 20:53:04 tom Exp $ + vile:dos + --> <html> <head> <title> - :: hallo :: + :: hello :: </title> <meta http-equiv="content-type" content="text/html; charset=iso-8859-1"> - <meta name="generator" content="syn"> </head> <body> <table width="100%" summary="Lynx home page" align="right"> @@ -19,7 +22,7 @@ ...for quicker & saver browsing... </p> <p> - Light-wheight, fast and secure text browser. + Light-height, fast and secure text browser. </p> </td> </tr> diff --git a/src/LYMain.c b/src/LYMain.c index 15b635e9..1f0502ec 100644 --- a/src/LYMain.c +++ b/src/LYMain.c @@ -1,4 +1,4 @@ -/* $LynxId: LYMain.c,v 1.176 2008/01/03 00:41:55 Joey.Schulze Exp $ */ +/* $LynxId: LYMain.c,v 1.177 2008/01/06 18:55:37 tom Exp $ */ #include <HTUtils.h> #include <HTTP.h> #include <HTParse.h> @@ -61,14 +61,6 @@ #include <LYexit.h> #include <LYLeaks.h> -#ifdef FNAMES_8_3 -#define COOKIE_FILE "cookies" -#define TRACE_FILE "LY-TRACE.LOG" -#else -#define COOKIE_FILE ".lynx_cookies" -#define TRACE_FILE "Lynx.trace" -#endif /* FNAMES_8_3 */ - /* ahhhhhhhhhh!! Global variables :-< */ #ifdef SOCKS BOOLEAN socks_flag = TRUE; @@ -1379,7 +1371,7 @@ int main(int argc, * Set up the TRACE log path, and logging if appropriate. - FM */ if ((cp = LYGetEnv("LYNX_TRACE_FILE")) == 0) - cp = TRACE_FILE; + cp = FNAME_LYNX_TRACE; LYTraceLogPath = typeMallocn(char, LY_MAXPATH); LYAddPathToHome(LYTraceLogPath, LY_MAXPATH, cp); @@ -1697,7 +1689,7 @@ int main(int argc, if (LYCookieFile == NULL) { LYCookieFile = typeMallocn(char, LY_MAXPATH); - LYAddPathToHome(LYCookieFile, LY_MAXPATH, COOKIE_FILE); + LYAddPathToHome(LYCookieFile, LY_MAXPATH, FNAME_LYNX_COOKIES); } else { LYTildeExpand(&LYCookieFile, FALSE); } diff --git a/src/LYUtils.c b/src/LYUtils.c index e2ef3e0f..df8a516a 100644 --- a/src/LYUtils.c +++ b/src/LYUtils.c @@ -1,4 +1,4 @@ -/* $LynxId: LYUtils.c,v 1.164 2007/11/12 00:54:18 tom Exp $ */ +/* $LynxId: LYUtils.c,v 1.165 2008/01/06 18:31:26 Thorsten.Glaser Exp $ */ #include <HTUtils.h> #include <HTTCP.h> #include <HTParse.h> @@ -5903,7 +5903,7 @@ static BOOL IsOurSymlink(const char *name) if (cutoff != 0) { HTSprintf0(&clone, "%.*s%s%s", - cutoff - name, + (int) (cutoff - name), name, PATHSEP_STR, buffer); FREE(buffer); buffer = clone; diff --git a/src/LYrcFile.c b/src/LYrcFile.c index b50bc416..06a5e913 100644 --- a/src/LYrcFile.c +++ b/src/LYrcFile.c @@ -1,4 +1,4 @@ -/* $LynxId: LYrcFile.c,v 1.68 2007/05/23 00:22:06 tom Exp $ */ +/* $LynxId: LYrcFile.c,v 1.71 2008/01/06 18:51:40 tom Exp $ */ #include <HTUtils.h> #include <HTFTP.h> #include <LYUtils.h> @@ -13,12 +13,6 @@ #include <LYLeaks.h> -#ifdef FNAMES_8_3 -#define FNAME_LYNXRC "lynx.rc" -#else -#define FNAME_LYNXRC ".lynxrc" -#endif /* FNAMES_8_3 */ - #define MSG_ENABLE_LYNXRC N_("Normally disabled. See ENABLE_LYNXRC in lynx.cfg\n") #define putBool(value) ((value) ? "on" : "off") /* *INDENT-OFF* */ @@ -358,7 +352,7 @@ settings made here.\n\ #ifdef USE_PERSISTENT_COOKIES PARSE_STR(RC_COOKIE_FILE, LYCookieFile, N_("\ cookie_file specifies the file from which to read persistent cookies.\n\ -The default is ~/.lynx_cookies.\n\ +The default is ~/" FNAME_LYNX_COOKIES ".\n\ ")), #endif PARSE_STR(RC_COOKIE_LOOSE_INVALID_DOMAINS, LYCookieLooseCheckDomains, N_("\ diff --git a/src/UCAuto.c b/src/UCAuto.c index 26d6bda8..92378f9c 100644 --- a/src/UCAuto.c +++ b/src/UCAuto.c @@ -1,4 +1,6 @@ /* + * $LynxId: UCAuto.c,v 1.37 2008/01/07 23:51:16 tom Exp $ + * * This file contains code for changing the Linux console mode. * Currently some names for font files are hardwired in here. * You have to change this code if it needs accommodation for your @@ -29,6 +31,7 @@ #ifdef EXP_CHARTRANS_AUTOSWITCH #include <HTFile.h> +#include <www_wait.h> #ifdef LINUX #include <sysexits.h> /* EX_DATAERR, etc. */ diff --git a/src/chrtrans/makeuctb.c b/src/chrtrans/makeuctb.c index 43110496..24372894 100644 --- a/src/chrtrans/makeuctb.c +++ b/src/chrtrans/makeuctb.c @@ -1,5 +1,5 @@ /* - * $LynxId: makeuctb.c,v 1.35 2007/07/31 20:32:32 Tim.Larson Exp $ + * $LynxId: makeuctb.c,v 1.36 2008/01/06 18:23:33 tom Exp $ * * makeuctb.c, derived from conmakehash.c - kw * @@ -294,7 +294,7 @@ int main(int argc, char **argv) FILE *ctbl; char buffer[65536]; - char outname[256]; + char *outname = 0; unsigned n; int fontlen; int i, nuni, nent; @@ -327,12 +327,15 @@ int main(int argc, char **argv) } else if (ctbl == stdin) { chdr = stdout; hdrname = "stdout"; - } else { + } else if ((outname = malloc(strlen(tblname) + 3)) != 0) { strcpy(outname, tblname); hdrname = outname; if ((p = strrchr(outname, '.')) == 0) p = outname + strlen(outname); strcpy(p, ".h"); + } else { + perror("malloc"); + done(EX_NOINPUT); } if (chdr == 0) { @@ -541,7 +544,11 @@ int main(int argc, char **argv) continue; } - tbuf = (char *) malloc(4 * strlen(p)); + /* + * Allocate a string large enough for the worst-case use in the + * loop using sprintf. + */ + tbuf = (char *) malloc(5 * strlen(p)); if (!(p1 = tbuf)) { fprintf(stderr, "%s: Out of memory\n", tblname); diff --git a/userdefs.h b/userdefs.h index dc0bb66b..4c9ba1d3 100644 --- a/userdefs.h +++ b/userdefs.h @@ -1,5 +1,5 @@ /* - * $LynxId: userdefs.h,v 1.230 2008/01/03 00:51:36 Joey.Schulze Exp $ + * $LynxId: userdefs.h,v 1.232 2008/01/06 19:01:29 tom Exp $ * * Lynx - Hypertext navigation system * @@ -247,7 +247,7 @@ * Things you must change - non-VMS specific * Section 1b). */ -#else /* non-VMS: UNIX etc. */ +#else /* non-VMS: UNIX etc. */ /************************** * NOTE: This variable is set by the configure script; editing changes will @@ -895,7 +895,6 @@ */ #define ACCEPT_ALL_COOKIES FALSE - /**************************************************************** * Section 2. Things that you probably want to change or review * @@ -981,7 +980,7 @@ #define BOXHORI '-' /* #define BOXHORI 0 */ #endif /* DOSPATH */ -#endif /* !HAVE_CONFIG_H */ +#endif /* !HAVE_CONFIG_H */ /****************************** * LY_UMLAUT controls the 7-bit expansion of characters with dieresis or @@ -1157,7 +1156,7 @@ * * NOTE: This can generate A LOT of mail, be warned. */ -#define MAIL_SYSTEM_ERROR_LOGGING FALSE /*mail a message for every error?*/ +#define MAIL_SYSTEM_ERROR_LOGGING FALSE /*mail a message for every error? */ /********************************* * If a document cannot be accessed, and MAIL_SYSTEM_ERROR_LOGGING @@ -1167,7 +1166,7 @@ * * NOTE: This can generate A REAL LOT of mail, be warned!!! */ -/* #define ALERTMAIL "webmaster@localhost" */ /*error recipient if no owner*/ +/* #define ALERTMAIL "webmaster@localhost" *//*error recipient if no owner */ /********************************* * If CHECKMAIL is set to TRUE, the user will be informed (via a status line @@ -1193,8 +1192,8 @@ * Vi or Emacs movement keys. These are defaults, * which can be changed in lynx.cfg , the Options Menu or .lynxrc . */ -#define VI_KEYS_ALWAYS_ON FALSE /* familiar h j k l */ -#define EMACS_KEYS_ALWAYS_ON FALSE /* familiar ^N ^P ^F ^B */ +#define VI_KEYS_ALWAYS_ON FALSE /* familiar h j k l */ +#define EMACS_KEYS_ALWAYS_ON FALSE /* familiar ^N ^P ^F ^B */ /********************************* * DEFAULT_KEYPAD_MODE may be set to NUMBERS_AS_ARROWS @@ -1213,7 +1212,7 @@ * The default search. * This is a default that can be overridden in lynx.cfg or by the user! */ -#define CASE_SENSITIVE_ALWAYS_ON FALSE /* case sensitive user search */ +#define CASE_SENSITIVE_ALWAYS_ON FALSE /* case sensitive user search */ /******************************** * If NO_DOT_FILES is set TRUE here or in lynx.cfg, the user will not be @@ -1227,7 +1226,7 @@ * If it is FALSE at startup of Lynx, the user can regulate it via the * 'o'ptions menu, and may save the preference in the RC file. */ -#define NO_DOT_FILES TRUE /* disallow access to dot files */ +#define NO_DOT_FILES TRUE /* disallow access to dot files */ /******************************** * If MAKE_LINKS_FOR_ALL_IMAGES is TRUE, all images will be given links @@ -1242,7 +1241,7 @@ * * The default also can be toggled via an "-image_links" command line switch. */ -#define MAKE_LINKS_FOR_ALL_IMAGES FALSE /* inlines cast to links */ +#define MAKE_LINKS_FOR_ALL_IMAGES FALSE /* inlines cast to links */ /******************************** * If MAKE_PSEUDO_ALTS_FOR_INLINES is FALSE, inline images which do not @@ -1258,7 +1257,7 @@ * The default also can be toggled via a "-pseudo_inlines" command line * switch. */ -#define MAKE_PSEUDO_ALTS_FOR_INLINES TRUE /* Use "[INLINE]" pseudo-ALTs */ +#define MAKE_PSEUDO_ALTS_FOR_INLINES TRUE /* Use "[INLINE]" pseudo-ALTs */ /******************************** * If SUBSTITUTE_UNDERSCORES is TRUE, the _underline_ format will be used @@ -1267,7 +1266,7 @@ * The default defined here can be changed in lynx.cfg, and the user can * toggle the default via a "-underscore" command line switch. */ -#define SUBSTITUTE_UNDERSCORES FALSE /* Use _underline_ format in dumps */ +#define SUBSTITUTE_UNDERSCORES FALSE /* Use _underline_ format in dumps */ /******************************** * If QUIT_DEFAULT_YES is defined as TRUE then when the QUIT command @@ -1346,7 +1345,6 @@ #include <LYMessages_en.h> #endif /* !LYMESSAGES_EN_H */ - /**************************************************************** * DEFAULT_VISITED_LINKS may be set to one or more of * VISITED_LINKS_AS_FIRST_V @@ -1360,7 +1358,6 @@ */ #define DEFAULT_VISITED_LINKS (VISITED_LINKS_AS_LATEST | VISITED_LINKS_REVERSE) - /**************************************************************** * Section 3. Things that you should not change until you * have a good knowledge of the program @@ -1404,6 +1401,30 @@ #define HTML_SUFFIX ".html" #endif +#ifndef FNAME_LYNXRC +#ifdef FNAMES_8_3 +#define FNAME_LYNXRC "lynx.rc" +#else +#define FNAME_LYNXRC ".lynxrc" +#endif /* FNAMES_8_3 */ +#endif + +#ifndef FNAME_LYNX_COOKIES +#ifdef FNAMES_8_3 +#define FNAME_LYNX_COOKIES "cookies" +#else +#define FNAME_LYNX_COOKIES ".lynx_cookies" +#endif /* FNAMES_8_3 */ +#endif + +#ifndef FNAME_LYNX_TRACE +#ifdef FNAMES_8_3 +#define FNAME_LYNX_TRACE "LY-TRACE.LOG" +#else +#define FNAME_LYNX_TRACE "Lynx.trace" +#endif /* FNAMES_8_3 */ +#endif + #define BIN_SUFFIX ".bin" #define TEXT_SUFFIX ".txt" @@ -1497,7 +1518,7 @@ */ #endif /* HAVE_CONFIG_H */ -#else /* Unix */ +#else /* Unix */ /* Standard locations are defined via the configure script. When * helper applications are in your home directory or other nonstandard * locations, you probably will have to preset the path to them with @@ -1506,7 +1527,6 @@ #endif /* DOSPATH */ #endif /* VMS */ - /***************************** * I have not ported multibyte support for EBCDIC. In fact, some multibyte * code in LYLowerCase() crashes on EBCDIC strings. -- gil @@ -1571,7 +1591,6 @@ */ #define SSL_CERT_FILE NULL - /**************************************************************** * Section 4. Things you MUST check only if you plan to use Lynx * in an anonymous account (allow public access to Lynx). @@ -1643,7 +1662,7 @@ * set to FALSE if you don't want users of your anonymous * account to be able to goto particular URLs. */ -#define CAN_ANONYMOUS_GOTO_BIBP TRUE /* BIBP maps to HTTP */ +#define CAN_ANONYMOUS_GOTO_BIBP TRUE /* BIBP maps to HTTP */ #define CAN_ANONYMOUS_GOTO_CSO FALSE #define CAN_ANONYMOUS_GOTO_FILE FALSE #define CAN_ANONYMOUS_GOTO_FINGER TRUE |