Commit 8ff101cf authored by Axel Beckert's avatar Axel Beckert

Merge tag 'upstream/2.8.9dev14'

Upstream version 2.8.9dev14

# gpg: Signature made Thu May 11 03:15:01 2017 CEST
# gpg:                using RSA key 468C89793B429819E9D761266BE663C75A35C975
# gpg: please do a --check-trustdb
# gpg: Good signature from "Axel Beckert <abe@deuxchevaux.org>" [ultimate]
# gpg:                 aka "Axel Beckert (E-Mail + Jabber) <abe@noone.org>" [ultimate]
# gpg:                 aka "Axel Beckert (Symlink) <xtaran@symlink.ch>" [ultimate]
# gpg:                 aka "[jpeg image of size 3155]" [ultimate]
# gpg:                 aka "Axel Stefan Beckert" [ultimate]
# gpg:                 aka "Axel Beckert (FSFE Fellow) <abe@fsfe.org>" [ultimate]
# gpg:                 aka "Axel Beckert (Debian Developer) <abe@debian.org>" [ultimate]
parents fa73ec50 a65ab4d2
-- $LynxId: CHANGES,v 1.889 2017/04/29 14:43:40 tom Exp $
-- $LynxId: CHANGES,v 1.894 2017/05/11 01:03:49 tom Exp $
===============================================================================
Changes since Lynx 2.8 release
===============================================================================
2017-05-10 (2.8.9dev.14)
* amend fix for Debian #841155, adding check for complete multibyte strings to
decide when the cell-limit has been met (Debian #862148) -TD
* minor improvements to configure script to reduce warnings in config.log -TD
* update config.sub (2017-04-02)
* compiler-warning fixes for c99 on OSX -TD
2017-04-29 (2.8.9dev.13)
* amend fix for Debian #841155, adding check for special case where the
expected number of cells is zero (report by Larry Hynes) -TD
......
lynx-dev (2.8.9dev.13) unstable; urgency=low
lynx-dev (2.8.9dev.14) unstable; urgency=low
* maintenance updates
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 29 Apr 2017 08:47:15 -0400
-- Thomas E. Dickey <dickey@invisible-island.net> Sun, 30 Apr 2017 12:02:52 -0400
lynx-dev (2.8.8dev.16) unstable; urgency=high
......
; $LynxId: lynx.nsi,v 1.34 2017/04/29 12:47:15 tom Exp $
; $LynxId: lynx.nsi,v 1.35 2017/04/30 16:02:52 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 "1013"
!define VERSION_PATCH "dev.13"
!define VERSION_LEVEL "1014"
!define VERSION_PATCH "dev.14"
!define SUBKEY "Lynx"
......
# $LynxId: lynx.spec,v 1.40 2017/04/29 12:47:15 tom Exp $
# $LynxId: lynx.spec,v 1.41 2017/04/30 16:02:52 tom Exp $
Summary: A text-based Web browser
Name: lynx
Version: 2.8.9
Release: dev.13
Release: dev.14
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.13"
#define LYNX_VERSION "2.8.9dev.14"
; most-recent full release and target
#define LYNX_RELEASE "2.8.9"
......
/*
* $LynxId: HTTCP.c,v 1.137 2017/01/02 02:11:14 tom Exp $
* $LynxId: HTTCP.c,v 1.138 2017/04/30 17:52:00 tom Exp $
*
* Generic Communication Code HTTCP.c
* ==========================
......@@ -389,7 +389,7 @@ static void dump_hostent(const char *msgprefix,
CTRACE((tfp, "%s: %p ", msgprefix, (const void *) phost));
if (phost) {
CTRACE((tfp, "{ h_name = %p", phost->h_name));
CTRACE((tfp, "{ h_name = %p", (void *) phost->h_name));
if (phost->h_name) {
CTRACE((tfp, " \"%s\",", phost->h_name));
} else {
......@@ -401,7 +401,7 @@ static void dump_hostent(const char *msgprefix,
for (pcnt = phost->h_aliases; *pcnt; pcnt++) {
CTRACE((tfp, "%s %p \"%s\"",
(pcnt == phost->h_aliases ? " " : ", "),
*pcnt, *pcnt));
(void *) *pcnt, *pcnt));
}
CTRACE((tfp, "%s0x0 },\n\t",
(*phost->h_aliases ? ", " : " ")));
......@@ -416,7 +416,7 @@ static void dump_hostent(const char *msgprefix,
for (pcnt = phost->h_addr_list; *pcnt; pcnt++) {
CTRACE((tfp, "%s %p",
(pcnt == phost->h_addr_list ? "" : ","),
*pcnt));
(void *) *pcnt));
for (i = 0; i < phost->h_length; i++) {
CTRACE((tfp, "%s%d%s", (i == 0 ? " \"" : "."),
(int) *((unsigned char *) (*pcnt) + i),
......
dnl $LynxId: aclocal.m4,v 1.235 2017/04/27 09:15:35 tom Exp $
dnl $LynxId: aclocal.m4,v 1.236 2017/05/10 22:32:05 tom Exp $
dnl Macros for auto-configure script.
dnl by Thomas E. Dickey <dickey@invisible-island.net>
dnl and Jim Spath <jspath@mail.bcpl.lib.md.us>
......@@ -2665,7 +2665,7 @@ AC_TRY_LINK([
test "$cf_cv_fionbio" = "fcntl" && AC_DEFINE(USE_FCNTL,1,[Define to 1 if we should use fcntl])
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_FUNC_CURSES_VERSION version: 6 updated: 2012/10/06 16:39:58
dnl CF_FUNC_CURSES_VERSION version: 7 updated: 2017/05/10 18:31:29
dnl ----------------------
dnl Solaris has a data item 'curses_version', which confuses AC_CHECK_FUNCS.
dnl It's a character string "SVR4", not documented.
......@@ -2674,7 +2674,7 @@ AC_DEFUN([CF_FUNC_CURSES_VERSION],
AC_CACHE_CHECK(for function curses_version, cf_cv_func_curses_version,[
AC_TRY_RUN([
#include <${cf_cv_ncurses_header:-curses.h}>
int main()
int main(void)
{
char temp[1024];
sprintf(temp, "%s\n", curses_version());
......@@ -2687,7 +2687,7 @@ rm -f core])
test "$cf_cv_func_curses_version" = yes && AC_DEFINE(HAVE_CURSES_VERSION,1,[Define to 1 if we have curses_version function])
])
dnl ---------------------------------------------------------------------------
dnl CF_FUNC_GETADDRINFO version: 8 updated: 2012/11/08 20:57:52
dnl CF_FUNC_GETADDRINFO version: 9 updated: 2017/05/10 18:31:29
dnl -------------------
dnl Look for a working version of getaddrinfo(), for IPV6 support.
AC_DEFUN([CF_FUNC_GETADDRINFO],[
......@@ -2701,7 +2701,7 @@ AC_TRY_RUN([
#define expect(a,b) if (strcmp(a,b) != 0) goto bad
int main()
int main(void)
{
int passive, gaierr, inet4 = 0, inet6 = 0;
struct addrinfo hints, *ai, *aitop;
......@@ -4049,7 +4049,7 @@ CF_UPPER(cf_nculib_ROOT,HAVE_LIB$cf_nculib_root)
AC_DEFINE_UNQUOTED($cf_nculib_ROOT)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_NCURSES_VERSION version: 14 updated: 2012/10/06 08:57:51
dnl CF_NCURSES_VERSION version: 15 updated: 2017/05/09 19:26:10
dnl ------------------
dnl Check for the version of ncurses, to aid in reporting bugs, etc.
dnl Call CF_CURSES_CPPFLAGS first, or CF_NCURSES_CPPFLAGS. We don't use
......@@ -4064,7 +4064,7 @@ AC_CACHE_CHECK(for ncurses version, cf_cv_ncurses_version,[
AC_TRY_RUN([
#include <${cf_cv_ncurses_header:-curses.h}>
#include <stdio.h>
int main()
int main(void)
{
FILE *fp = fopen("$cf_tempfile", "w");
#ifdef NCURSES_VERSION
......@@ -4919,7 +4919,7 @@ CF_VERBOSE(...checked $1 [$]$1)
AC_SUBST(EXTRA_LDFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_SET_ERRNO version: 5 updated: 2012/11/08 20:57:52
dnl CF_SET_ERRNO version: 6 updated: 2017/05/10 18:31:29
dnl ------------
dnl Check if 'errno' is declared in a fashion that lets us set it.
AC_DEFUN([CF_SET_ERRNO],
......@@ -4927,7 +4927,7 @@ AC_DEFUN([CF_SET_ERRNO],
AC_CACHE_CHECK(if we can set errno,cf_cv_set_errno,[
AC_TRY_RUN([
#include <errno.h>
int main()
int main(void)
{
errno = 255;
${cf_cv_main_return:-return}(errno != 255);
......
......@@ -2,7 +2,7 @@
# Configuration validation subroutine script.
# Copyright 1992-2017 Free Software Foundation, Inc.
timestamp='2017-02-07'
timestamp='2017-04-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -263,7 +263,7 @@ case $basic_machine in
| fido | fr30 | frv | ft32 \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| hexagon \
| i370 | i860 | i960 | ia64 \
| i370 | i860 | i960 | ia16 | ia64 \
| ip2k | iq2000 \
| k1om \
| le32 | le64 \
......@@ -315,6 +315,7 @@ case $basic_machine in
| ubicom32 \
| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
| visium \
| wasm32 \
| we32k \
| x86 | xc16x | xstormy16 | xtensa \
| z8k | z80)
......@@ -388,7 +389,7 @@ case $basic_machine in
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| hexagon-* \
| i*86-* | i860-* | i960-* | ia64-* \
| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
| ip2k-* | iq2000-* \
| k1om-* \
| le32-* | le64-* \
......@@ -446,6 +447,7 @@ case $basic_machine in
| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
| vax-* \
| visium-* \
| wasm32-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* \
| xstormy16-* | xtensa*-* \
......@@ -1246,6 +1248,9 @@ case $basic_machine in
basic_machine=a29k-wrs
os=-vxworks
;;
wasm32)
basic_machine=wasm32-unknown
;;
w65*)
basic_machine=w65-wdc
os=-none
......
This diff is collapsed.
dnl $LynxId: configure.in,v 1.287 2017/04/29 14:49:46 tom Exp $
dnl $LynxId: configure.in,v 1.288 2017/04/30 16:02:52 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.13)
AC_REVISION(2.8.9dev.14)
# 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.13
VERSION=2.8.9dev.14
AC_SUBST(PACKAGE)
AC_SUBST(VERSION)
......
# $LynxId: lynx.cfg,v 1.280 2017/04/29 12:47:15 tom Exp $
# $LynxId: lynx.cfg,v 1.281 2017/04/30 16:02:52 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.13"
#PRCS LYNX_VERSION "2.8.9dev.14"
#
# $Format: "#PRCS LYNX_DATE \"$ProjectDate$\""$
#PRCS LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
#PRCS LYNX_DATE "Sun, 30 Apr 2017 12:02:52 -0400"
#
# Definition pairs are of the form VARIABLE:DEFINITION
# NO spaces are allowed between the pair items.
......
# $LynxId: makefile.in,v 1.160 2017/04/29 12:47:15 tom Exp $
# $LynxId: makefile.in,v 1.161 2017/04/30 16:02:52 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.13
LYNX_VERSION = 2.8.9dev.14
## 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: HTFWriter.c,v 1.111 2017/02/11 00:28:32 tom Exp $
* $LynxId: HTFWriter.c,v 1.112 2017/04/30 17:55:13 tom Exp $
*
* FILE WRITER HTFWrite.h
* ===========
......@@ -173,7 +173,7 @@ static void decompress_gzip(HTStream *me)
}
gzclose(gzfp);
LYCloseTempFP(fp);
CTRACE((tfp, "...decompress %ld to %ld\n",
CTRACE((tfp, "...decompress %" PRI_off_t " to %ld\n",
me->anchor->actual_length,
actual));
if (success) {
......
/*
* $LynxId: HTML.c,v 1.168 2016/11/24 18:18:18 tom Exp $
* $LynxId: HTML.c,v 1.170 2017/04/30 18:45:06 tom Exp $
*
* Structured stream to Rich hypertext converter
* ============================================
......@@ -4717,7 +4717,7 @@ static int HTML_start_element(HTStructured * me, int element_number,
}
CTRACE((tfp, "2.Ok, we're trying type=[%s] (present=%p)\n",
NONNULL(I.type),
present));
(const void *) present));
/* text+file don't go in here */
if ((UseALTasVALUE == TRUE) ||
(present && present[HTML_INPUT_VALUE] &&
......
/* $LynxId: LYCurses.c,v 1.183 2017/03/18 21:42:48 tom Exp $ */
/* $LynxId: LYCurses.c,v 1.184 2017/04/30 17:52:12 tom Exp $ */
#include <HTUtils.h>
#include <HTAlert.h>
......@@ -572,7 +572,7 @@ void wcurses_css(WINDOW * win, char *name,
if (tmpHash == NOSTYLE) {
char *pclass = strrchr(name, '.');
CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", pclass));
CTRACE2(TRACE_STYLE, (tfp, "undefined, trimming at %p\n", (void *) pclass));
if (pclass)
*pclass = '\0';
else
......
// $LynxId: LYIcon.rc,v 1.28 2017/04/29 12:47:15 tom Exp $
// $LynxId: LYIcon.rc,v 1.29 2017/04/30 16:02:52 tom Exp $
#include <windows.h>
100 ICON "../samples/lynx.ico"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,8,9,1013
PRODUCTVERSION 2,8,9,1013
FILEVERSION 2,8,9,1014
PRODUCTVERSION 2,8,9,1014
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_NT_WINDOWS32
......@@ -19,12 +19,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "http://invisible-island.net/lynx"
VALUE "FileDescription", "Lynx - web browser"
VALUE "FileVersion", "2.8.9.1013"
VALUE "FileVersion", "2.8.9.1014"
VALUE "InternalName", "Lynx"
VALUE "LegalCopyright", "1997-2017 Thomas E. Dickey"
VALUE "OriginalFilename", "lynx.exe"
VALUE "ProductName", "Lynx - web browser"
VALUE "ProductVersion", "2.8.9.1013"
VALUE "ProductVersion", "2.8.9.1014"
END
END
BLOCK "VarFileInfo"
......
/* $LynxId: LYStrings.c,v 1.267 2017/04/29 14:38:32 tom Exp $ */
/* $LynxId: LYStrings.c,v 1.268 2017/05/10 22:11:33 tom Exp $ */
#include <HTUtils.h>
#include <HTCJK.h>
#include <UCAux.h>
......@@ -3068,6 +3068,39 @@ static int mbcs_glyphs(char *s, int len)
return glyphs;
}
/*
* Check if there are no continuation bytes in the multibyte (sub)string of
* length len.
*/
static int mbcs_valid(char *s, int len, int limit)
{
int i;
int result = FALSE;
if (IS_UTF8_TTY) {
for (i = 0; s[i] && i < limit; i++) {
if (!IS_UTF8_EXTRA(s[i])) {
if ((i + 1) == len) {
result = TRUE;
break;
}
}
}
} else if (IS_CJK_TTY) {
for (i = 0; s[i] && i < limit; i++) {
if (!is8bits(s[i])) {
if ((i + 1) == len) {
result = TRUE;
break;
}
}
}
} else {
result = TRUE;
}
return result;
}
/*
* Calculates offset in bytes of a glyph at cell position pos.
*/
......@@ -3116,6 +3149,8 @@ static int cell2char(char *s, int cells)
break;
/* the best solution is the one with the most bytes */
best = pos;
if (mbcs_valid(s, pos, len))
break;
}
}
if (best >= 0)
......
/*
* $LynxId: userdefs.h,v 1.325 2017/04/29 12:47:15 tom Exp $
* $LynxId: userdefs.h,v 1.326 2017/04/30 16:02:52 tom Exp $
*
* Lynx - Hypertext navigation system
*
......@@ -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.13"
#define LYNX_VERSION "2.8.9dev.14"
#define LYNX_WWW_HOME "http://lynx.invisible-island.net/"
#define LYNX_WWW_DIST "http://lynx.invisible-island.net/current/"
/* $Format: "#define LYNX_DATE \"$ProjectDate$\""$ */
#define LYNX_DATE "Sat, 29 Apr 2017 08:47:15 -0400"
#define LYNX_DATE "Sun, 30 Apr 2017 12:02:52 -0400"
#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