Commit 3774ce34 authored by Axel Beckert's avatar Axel Beckert

Imported Upstream version 2.8.9dev3

parent 69e57267
-- $LynxId: CHANGES,v 1.766 2014/12/21 21:30:08 tom Exp $
-- $LynxId: CHANGES,v 1.771 2015/01/05 09:17:08 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2015-01-05 (2.8.9dev.3)
* correct shortcut for "Send To" link used in Inno Setup script, broken in
2.8.8dev.15 -TD
* amend change made in 2.8.8dev.10 to LYLocal.c get_filename(), ensuring that
the bstring parameter can be (re)allocated within that function's call to
LYgetBString() (report by Raoul Megelas) -TG
* build-fixes for djgpp 2.04 and gcc 4.8.4 using Watt-32 -GV
2014-12-21 (2.8.9dev.2)
* correct an inconsistent check for reload using isLYNXCGI() in the
options-screen -TD
......@@ -7915,7 +7923,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
* correct order of params for non-Unix use of HTAddParam in LYBookmark.c
(reported by DK) -TD
1998-12-31
1998-12-31 (2.8.2dev.12a)
* delete unused 'PREVAIL' color-style code from HTML.c, merge a couple of
sections of logic with TrimColorClass, and change Style_className to
a dynamically-allocated string - TD
......@@ -8454,7 +8462,7 @@ recently, FreeBSD 4.1, NetBSD 1.5 and OpenBSD 2.8 (curses/ncurses).
* first cut of integrating Jim Spath's changes to incorporate message library
support - JES, TD
1998-09-20
1998-09-20 (2.8.1dev.29-intl)
* edited files for language hooks (JES):
src/HTAlert.c src/HTInit.c src/HTML.c src/LYBookmark.c src/LYCgi.c
src/LYClean.c src/LYCookie.c src/LYCurses.c src/LYDownload.c src/LYEdit.c
......
Copyright 1997-2013,2014 Thomas E. Dickey
Copyright 1997-2014,2015 Thomas E. Dickey
This copyright notice must be included in all copies or substantial
portions of Lynx. It outlines rights and restrictions for Lynx which
......@@ -80,5 +80,5 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
*/
------------------------------------------------------------------------------
-- vile:txtmode fc=72 noti
-- $LynxId: COPYHEADER,v 1.11 2014/01/09 00:19:22 tom Exp $
-- $LynxId: COPYHEADER,v 1.12 2015/01/02 12:26:47 tom Exp $
------------------------------------------------------------------------------
......@@ -2,7 +2,7 @@
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: See http://invisible-island.net/public/public.html for info
iEYEABECAAYFAlLN6xgACgkQcCNT4PfkjtsllwCfQQMuuTgr3BFvBSEzFWW7IDyi
UNMAnjdg4UMMG8jYxiqZIe8M7i8yEhzl
=OkY+
iEYEABECAAYFAlSmkEIACgkQcCNT4PfkjtvDHgCcCuPQT6btzjHea86OJcHDxdzA
ykwAoMQ1m8J2Po3yv31ULFXSTS/yDmWH
=BGPK
-----END PGP SIGNATURE-----
lynx-dev (2.8.9dev.2) unstable; urgency=low
lynx-dev (2.8.9dev.3) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 16 Mar 2014 11:03:40 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Tue, 30 Dec 2014 16:37:40 -0500
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
......@@ -47,7 +47,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
Files: aclocal.m4
Licence: other-BSD
Copyright: 1997-2013,2014 by Thomas E. Dickey
Copyright: 1997-2014,2015 by Thomas E. Dickey
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
......@@ -101,7 +101,7 @@ Licence: other-BSD
shared with many OS's install programs.
Files: debian/*
Copyright: 2010-2013,2014 Thomas E. Dickey
Copyright: 2010-2014,2015 Thomas E. Dickey
Licence: other-BSD
Permission to use, copy, modify, and distribute this software and its
documentation for any purpose and without fee is hereby granted,
......
; $LynxId: lynx.iss,v 1.13 2014/12/22 00:44:43 tom Exp $
; $LynxId: lynx.iss,v 1.15 2015/01/05 09:15:38 tom Exp $
; vile:ts=2 sw=2 notabinsert
;
; This is the BASE script for different flavors of the installer for Lynx.
......@@ -90,7 +90,7 @@ AppName={#MyAppName}
#emit 'VersionInfoVersion=' + LYNX_TARGET1
AppVerName={#MyAppVerName}
AppPublisher={#MyAppPublisher}
AppCopyright= 1997-2013,2014, Thomas E. Dickey
AppCopyright= 1997-2014,2015, Thomas E. Dickey
AppPublisherURL={#MyAppURL}
AppSupportURL={#MyAppURL}
AppUpdatesURL={#MyAppURL}
......@@ -172,7 +172,7 @@ Type: dirifempty; Name: {app}
#emit 'Type: files; Name: ' + myQuickLaunch
[Code]
#emit 'const MY_APP_NAME = ''{app}\' + myAppName + '.exe'';'
#emit 'const MY_APP_NAME = ''{app}\' + myAppProg + '.exe'';'
function isGuru(): Boolean;
begin
......
; $LynxId: lynx.nsi,v 1.19 2014/03/16 15:03:40 tom Exp $
; $LynxId: lynx.nsi,v 1.21 2015/01/02 12:27:30 tom Exp $
; Script originally generated with the Venis Install Wizard, but customized.
; The Inno Setup script is preferred; but this can be built via cross-compiling.
......@@ -9,8 +9,8 @@
!define VERSION_EPOCH "2"
!define VERSION_MAJOR "8"
!define VERSION_MINOR "9"
!define VERSION_LEVEL "1002"
!define VERSION_PATCH "dev.2"
!define VERSION_LEVEL "1003"
!define VERSION_PATCH "dev.3"
!define SUBKEY "Lynx"
......@@ -28,7 +28,7 @@ SetCompressor /SOLID lzma
VIAddVersionKey ProductName "${SUBKEY}"
VIAddVersionKey CompanyName "http://lynx.isc.org"
VIAddVersionKey LegalCopyright " 1997-2013,2014, Thomas E. Dickey"
VIAddVersionKey LegalCopyright " 1997-2014,2015, Thomas E. Dickey"
VIAddVersionKey FileDescription "Lynx Installer (MinGW)"
VIAddVersionKey FileVersion "${VERSION}"
VIAddVersionKey ProductVersion "${VERSION}"
......
# $LynxId: lynx.spec,v 1.27 2014/03/16 15:03:40 tom Exp $
# $LynxId: lynx.spec,v 1.28 2014/12/30 21:37:40 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: dev.2
Release: dev.3
License: GPLv2
Group: Applications/Internet
Source: lynx%{version}%{release}.tgz
......
; version used for Inno Setup files.
; $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$
#define LYNX_VERSION "2.8.9dev.2"
#define LYNX_VERSION "2.8.9dev.3"
; most-recent full release and target
#define LYNX_RELEASE "2.8.9"
#define LYNX_TARGETS "2.8.9"
#define MyAppProg "Lynx"
#define MyAppName "Lynx - web browser"
#define MyAppPublisher "Thomas E Dickey"
#define MyAppURL "http://lynx.isc.org"
......
......@@ -1274,7 +1274,7 @@ rm conftest.sed
PACKAGE=lynx
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.9dev.2
VERSION=2.8.9dev.3
echo "$as_me:1279: checking for DESTDIR" >&5
echo $ECHO_N "checking for DESTDIR... $ECHO_C" >&6
dnl $LynxId: configure.in,v 1.269 2014/03/16 15:03:40 tom Exp $
dnl $LynxId: configure.in,v 1.270 2014/12/30 21:37:40 tom Exp $
dnl
dnl Process this file with autoconf to produce a configure script.
dnl
......@@ -29,7 +29,7 @@ dnl ---------------------------------------------------------------------------
dnl
dnl ask PRCS to plug-in the project-version for the configure-script.
dnl $Format: "AC_REVISION($ProjectVersion$)"$
AC_REVISION(2.8.9dev.2)
AC_REVISION(2.8.9dev.3)
# Save the original $CFLAGS so we can distinguish whether the user set those
# in the environment, or whether autoconf added -O and -g options:
......@@ -64,7 +64,7 @@ AC_ARG_PROGRAM
PACKAGE=lynx
dnl ask PRCS to plug-in the project-version for the packages.
# $Format: "VERSION=$ProjectVersion$"$
VERSION=2.8.9dev.2
VERSION=2.8.9dev.3
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......
# $LynxId: lynx.cfg,v 1.249 2014/03/16 15:03:40 tom Exp $
# $LynxId: lynx.cfg,v 1.251 2014/12/30 21:37:40 tom Exp $
# lynx.cfg file.
# The default placement for this file is /usr/local/lib/lynx.cfg (Unix)
# or Lynx_Dir:lynx.cfg (VMS)
#
# $Format: "#PRCS LYNX_VERSION \"$ProjectVersion$\""$
#PRCS LYNX_VERSION "2.8.9dev.2"
#PRCS LYNX_VERSION "2.8.9dev.3"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800"
#PRCS LYNX_DATE "Mon, 05 Jan 2015 16:40:38 -0800"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
......
# $LynxId: makefile.in,v 1.147 2014/03/16 15:03:40 tom Exp $
# $LynxId: makefile.in,v 1.148 2014/12/30 21:37:40 tom Exp $
##makefile for lynx
SHELL = @CONFIG_SHELL@
......@@ -46,7 +46,7 @@ TAR_UP = $(TAR) @TAR_UP_OPTIONS@ @TAR_PIPE_OPTIONS@
TAR_DOWN = $(TAR) @TAR_DOWN_OPTIONS@ @TAR_PIPE_OPTIONS@
# $Format: "LYNX_VERSION = $ProjectVersion$"$
LYNX_VERSION = 2.8.9dev.2
LYNX_VERSION = 2.8.9dev.3
## This is the version which we are developing (or, upon release, make this
## the same). Use no dots in the name, since it must work on VMS and MS-DOS.
......
// $LynxId: LYIcon.rc,v 1.13 2014/03/16 15:03:40 tom Exp $
// $LynxId: LYIcon.rc,v 1.15 2015/01/02 12:27:53 tom Exp $
#include <windows.h>
100 ICON "../samples/lynx.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,9,1002
PRODUCTVERSION 2,8,9,1002
FILEVERSION 2,8,9,1003
PRODUCTVERSION 2,8,9,1003
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
......@@ -19,12 +19,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "http://lynx.isc.org"
VALUE "FileDescription", "Lynx - web browser"
VALUE "FileVersion", "2.8.9.1002"
VALUE "FileVersion", "2.8.9.1003"
VALUE "InternalName", "Lynx"
VALUE "LegalCopyright", "1997-2014 Thomas E. Dickey"
VALUE "LegalCopyright", "1997-2015 Thomas E. Dickey"
VALUE "OriginalFilename", "lynx.exe"
VALUE "ProductName", "Lynx - web browser"
VALUE "ProductVersion", "2.8.9.1002"
VALUE "ProductVersion", "2.8.9.1003"
END
END
BLOCK "VarFileInfo"
......
/*
* $LynxId: LYLocal.c,v 1.128 2014/07/24 22:06:43 tom Exp $
* $LynxId: LYLocal.c,v 1.129 2015/01/05 01:28:10 Thorsten.Glaser Exp $
*
* Routines to manipulate the local filesystem.
* Written by: Rick Mallett, Carleton University
......@@ -80,7 +80,7 @@
#endif /* OK_INSTALL */
static int get_filename(const char *prompt,
bstring *buf);
bstring **buf);
#ifdef OK_PERMIT
static int permit_location(char *destpath,
......@@ -911,7 +911,7 @@ static int modify_name(char *testpath)
}
BStrCopy0(tmpbuf, LYPathLeaf(testpath));
if (get_filename(cp, tmpbuf)) {
if (get_filename(cp, &tmpbuf)) {
/*
* Do not allow the user to also change the location at this time.
......@@ -976,7 +976,7 @@ static int modify_location(char *testpath)
BStrCopy0(tmpbuf, testpath);
*LYPathLeaf(tmpbuf->str) = '\0';
if (get_filename(cp, tmpbuf)) {
if (get_filename(cp, &tmpbuf)) {
if (strlen(tmpbuf->str)) {
StrAllocCopy(savepath, testpath);
StrAllocCopy(newpath, testpath);
......@@ -1110,7 +1110,7 @@ static int create_file(char *current_location)
char *testpath = NULL;
BStrCopy0(tmpbuf, "");
if (get_filename(gettext("Enter name of file to create: "), tmpbuf)) {
if (get_filename(gettext("Enter name of file to create: "), &tmpbuf)) {
if (strstr(tmpbuf->str, "//") != NULL) {
HTAlert(gettext("Illegal redirection \"//\" found! Request ignored."));
......@@ -1147,7 +1147,7 @@ static int create_directory(char *current_location)
char *testpath = NULL;
BStrCopy0(tmpbuf, "");
if (get_filename(gettext("Enter name for new directory: "), tmpbuf)) {
if (get_filename(gettext("Enter name for new directory: "), &tmpbuf)) {
if (strstr(tmpbuf->str, "//") != NULL) {
HTAlert(gettext("Illegal redirection \"//\" found! Request ignored."));
......@@ -2205,28 +2205,28 @@ int dired_options(DocInfo *doc, char **newfile)
* Check DIRED filename, return true on success
*/
static int get_filename(const char *prompt,
bstring *buf)
bstring **bufp)
{
char *cp;
_statusline(prompt);
(void) LYgetBString(&buf, FALSE, 0, NORECALL);
if (strstr(buf->str, "../") != NULL) {
(void) LYgetBString(bufp, FALSE, 0, NORECALL);
if (strstr((*bufp)->str, "../") != NULL) {
HTAlert(gettext("Illegal filename; request ignored."));
return FALSE;
} else if (no_dotfiles || !show_dotfiles) {
cp = LYLastPathSep(buf->str); /* find last slash */
cp = LYLastPathSep((*bufp)->str); /* find last slash */
if (cp)
cp += 1;
else
cp = buf->str;
cp = (*bufp)->str;
if (*cp == '.') {
HTAlert(gettext("Illegal filename; request ignored."));
return FALSE;
}
}
return !isBEmpty(buf);
return !isBEmpty((*bufp));
}
#ifdef OK_INSTALL
......
/*
* $LynxId: LYMail.c,v 1.96 2013/11/28 11:23:37 tom Exp $
* $LynxId: LYMail.c,v 1.97 2014/12/30 22:16:41 Gisle.Vanem Exp $
*/
#include <HTUtils.h>
#include <HTParse.h>
......@@ -534,7 +534,6 @@ int LYSendMailFile(char *the_address,
#endif
#ifdef __DJGPP__
if (LYGetEnv("SHELL")) {
extern int dj_is_bash;
extern char *shell;
const char *c_option;
const char *format = "%s %s %s -t %s -F %s";
......
/*
* $LynxId: LYUtils.c,v 1.272 2014/12/22 00:22:55 tom Exp $
* $LynxId: LYUtils.c,v 1.273 2014/12/30 22:16:41 Gisle.Vanem Exp $
*/
#include <HTUtils.h>
#include <HTTCP.h>
......@@ -5183,7 +5183,7 @@ static char *HomeEnv(void)
{
char *result = CheckDir(LYGetEnv("HOME"));
#if defined (USE_DOS_DRIVES)
#if defined (USE_DOS_DRIVES) && defined(_WIN32)
if (result == 0) {
char *head;
char *leaf;
......
/*
* $LynxId: userdefs.h,v 1.297 2014/03/16 15:03:40 tom Exp $
* $LynxId: userdefs.h,v 1.300 2015/01/02 12:27:07 tom Exp $
*
* Lynx - Hypertext navigation system
*
* (c) Copyright 1992, 1993, 1994 University of Kansas
* 1995, 1996: GNU General Public License
*
* Copyright 1996-2013,2014 Thomas E. Dickey and Lynx Developers Group
* Copyright 1996-2014,2015 Thomas E. Dickey and Lynx Developers Group
* Note: GNU General Public License is not a copyright.
*/
......@@ -1442,11 +1442,11 @@
* the version definition with the Project Version on checkout. Just
* ignore it. - kw */
/* $Format: "#define LYNX_VERSION \"$ProjectVersion$\""$ */
#define LYNX_VERSION "2.8.9dev.2"
#define LYNX_VERSION "2.8.9dev.3"
#define LYNX_WWW_HOME "http://lynx.isc.org/"
#define LYNX_WWW_DIST "http://lynx.isc.org/current/"
/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
#define LYNX_DATE "Sun, 21 Dec 2014 17:39:40 -0800"
#define LYNX_DATE "Mon, 05 Jan 2015 16:40:38 -0800"
#define LYNX_DATE_OFF 5 /* truncate the automatically-generated date */
#define LYNX_DATE_LEN 11 /* truncate the automatically-generated date */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment