about summary refs log tree commit diff stats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CHANGES7
-rw-r--r--COPYHEADER4
-rw-r--r--COPYHEADER.asc6
-rw-r--r--PACKAGE/debian/copyright2
-rw-r--r--PACKAGE/lynx.iss4
-rw-r--r--PACKAGE/lynx.nsi4
-rw-r--r--WWW/Library/Implementation/HTTCP.c4
-rw-r--r--src/GridText.c18
-rw-r--r--src/LYCurses.c4
-rw-r--r--src/LYIcon.rc4
-rw-r--r--src/UCdomap.c44
-rw-r--r--userdefs.h4
12 files changed, 45 insertions, 60 deletions
diff --git a/CHANGES b/CHANGES
index eace0fd4..6c3d5308 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,12 @@
--- $LynxId: CHANGES,v 1.874 2017/01/01 02:03:07 tom Exp $
+-- $LynxId: CHANGES,v 1.877 2017/02/07 10:10:04 tom Exp $
 ===============================================================================
 Changes since Lynx 2.8 release
 ===============================================================================
 
-2016-12-31 (2.8.9dev.12)
+2017-02-07 (2.8.9dev.12)
+* amend comparision from 2.8.8dev.10 changes to handle slang specially
+  (report/testcase by TH) -TD
+* minor cleanup of UCDomap.c -TD
 * build-fix for color-style with leak-checking -TD
 * amend merge/fixes from
 	http://en.sourceforge.jp/project/lynx-win32-pata
diff --git a/COPYHEADER b/COPYHEADER
index 849034c4..5ce13a4a 100644
--- a/COPYHEADER
+++ b/COPYHEADER
@@ -1,4 +1,4 @@
-Copyright 1997-2015,2016 Thomas E. Dickey
+Copyright 1997-2016,2017 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.14 2016/04/11 00:41:05 tom Exp $
+-- $LynxId: COPYHEADER,v 1.15 2017/01/01 17:00:00 tom Exp $
 ------------------------------------------------------------------------------
diff --git a/COPYHEADER.asc b/COPYHEADER.asc
index 4e0089bf..41af11ac 100644
--- a/COPYHEADER.asc
+++ b/COPYHEADER.asc
@@ -2,7 +2,7 @@
 Version: GnuPG v1.4.12 (GNU/Linux)
 Comment: See http://invisible-island.net/public/public.html for info
 
-iEYEABECAAYFAlcK82QACgkQcCNT4PfkjttIuwCeOsxrhAi9MzzRMZdbuGdBgJ2o
-3fUAnjxUoC/JPkmGCvDtvumSH/10zquP
-=ge/N
+iEYEABECAAYFAlhpP/MACgkQcCNT4PfkjtuGHACgj9vomskwuqiP0vUMjTpy2w9Y
+Z10An2eosmBJQi+vBdtTxieiG5M/BD+f
+=tp9v
 -----END PGP SIGNATURE-----
diff --git a/PACKAGE/debian/copyright b/PACKAGE/debian/copyright
index 609f49b7..5eb37dfe 100644
--- a/PACKAGE/debian/copyright
+++ b/PACKAGE/debian/copyright
@@ -47,7 +47,7 @@ For reference, below is the original copyright notice for Lynx (2.4.2).
 
 Files: aclocal.m4
 License: other-BSD
-Copyright: 1997-2015,2016 by Thomas E. Dickey
+Copyright: 1997-2016,2017 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
diff --git a/PACKAGE/lynx.iss b/PACKAGE/lynx.iss
index acb43c09..d5c44b85 100644
--- a/PACKAGE/lynx.iss
+++ b/PACKAGE/lynx.iss
@@ -1,4 +1,4 @@
-; $LynxId: lynx.iss,v 1.16 2016/04/11 00:42:33 tom Exp $

+; $LynxId: lynx.iss,v 1.17 2017/01/02 02:22: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-2015,2016, Thomas E. Dickey

+AppCopyright=© 1997-2016,2017, Thomas E. Dickey

 AppPublisherURL={#MyAppURL}

 AppSupportURL={#MyAppURL}

 AppUpdatesURL={#MyAppURL}

diff --git a/PACKAGE/lynx.nsi b/PACKAGE/lynx.nsi
index 25dd023d..23cfd249 100644
--- a/PACKAGE/lynx.nsi
+++ b/PACKAGE/lynx.nsi
@@ -1,4 +1,4 @@
-; $LynxId: lynx.nsi,v 1.32 2016/11/23 18:22:52 tom Exp $

+; $LynxId: lynx.nsi,v 1.33 2017/01/02 02:22:38 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.

 

@@ -28,7 +28,7 @@ SetCompressor /SOLID lzma
 

 VIAddVersionKey ProductName "${SUBKEY}"

 VIAddVersionKey CompanyName "http://invisible-island.net/lynx"

-VIAddVersionKey LegalCopyright "© 1997-2015,2016, Thomas E. Dickey"

+VIAddVersionKey LegalCopyright "© 1997-2016,2017, Thomas E. Dickey"

 VIAddVersionKey FileDescription "Lynx Installer (MinGW)"

 VIAddVersionKey FileVersion "${VERSION}"

 VIAddVersionKey ProductVersion "${VERSION}"

diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index c5ceb041..f1648712 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.136 2016/11/24 18:06:26 tom Exp $
+ * $LynxId: HTTCP.c,v 1.137 2017/01/02 02:11:14 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1562,7 +1562,7 @@ static void really_getaddrinfo(const char *host,
 			       STATUSES * statuses,
 			       void **result)
 {
-    LYNX_ADDRINFO hints, *res;
+    LYNX_ADDRINFO hints, *res = 0;
     int error;
 
     memset(&hints, 0, sizeof(hints));
diff --git a/src/GridText.c b/src/GridText.c
index 35bd80e7..14ddf093 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.291 2017/01/01 00:56:20 Takeshi.Hataguchi Exp $
+ * $LynxId: GridText.c,v 1.292 2017/02/07 10:10:45 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -4305,14 +4305,18 @@ void HText_appendCharacter(HText *text, int ch)
 	       (int) (line->data[line->size - 1] == LY_SOFT_HYPHEN ? 1 : 0))
 	      - ctrl_chars_on_this_line);
 
-    if (((text->permissible_split
+    if ((
+#ifndef USE_SLANG
+	    (text->permissible_split
 #ifdef USE_CURSES_PADS
-	  || !LYwideLines
+	     || !LYwideLines
+#endif
+	    ) &&
 #endif
-	 ) && (actual
-	       + (int) style->rightIndent
-	       + ((IS_CJK_TTY && text->kanji_buf) ? 1 : 0)
-	 ) >= WRAP_COLS(text))
+	    (actual
+	     + (int) style->rightIndent
+	     + ((IS_CJK_TTY && text->kanji_buf) ? 1 : 0)
+	    ) >= WRAP_COLS(text))
 	|| (text->T.output_utf8
 	    && ((actual
 		 + UTFXTRA_ON_THIS_LINE
diff --git a/src/LYCurses.c b/src/LYCurses.c
index ab264b29..6b839c28 100644
--- a/src/LYCurses.c
+++ b/src/LYCurses.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYCurses.c,v 1.181 2016/11/04 21:54:57 tom Exp $ */
+/* $LynxId: LYCurses.c,v 1.182 2017/02/07 09:34:11 tom Exp $ */
 #include <HTUtils.h>
 #include <HTAlert.h>
 
@@ -2203,6 +2203,8 @@ void LYwaddnstr(WINDOW * w GCC_UNUSED,
     int y, x;
     size_t inx;
 
+    (void) y;
+    (void) y0;
 #ifdef USE_CURSES_PADS
     /*
      * If we've configured to use pads for left/right scrolling, that can
diff --git a/src/LYIcon.rc b/src/LYIcon.rc
index 9852920c..1112dde5 100644
--- a/src/LYIcon.rc
+++ b/src/LYIcon.rc
@@ -1,4 +1,4 @@
-// $LynxId: LYIcon.rc,v 1.26 2016/11/23 18:22:53 tom Exp $
+// $LynxId: LYIcon.rc,v 1.27 2017/01/02 02:22:38 tom Exp $
 
 #include <windows.h>
 
@@ -21,7 +21,7 @@ BEGIN
       VALUE "FileDescription",  "Lynx - web browser"
       VALUE "FileVersion",      "2.8.9.1012"
       VALUE "InternalName",     "Lynx"
-      VALUE "LegalCopyright",   "©1997-2016 Thomas E. Dickey"
+      VALUE "LegalCopyright",   "©1997-2017 Thomas E. Dickey"
       VALUE "OriginalFilename", "lynx.exe"
       VALUE "ProductName",      "Lynx - web browser"
       VALUE "ProductVersion",   "2.8.9.1012"
diff --git a/src/UCdomap.c b/src/UCdomap.c
index 3023bbb7..7e5d14ca 100644
--- a/src/UCdomap.c
+++ b/src/UCdomap.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCdomap.c,v 1.101 2015/10/02 11:25:55 tom Exp $
+ * $LynxId: UCdomap.c,v 1.102 2017/02/07 10:02:21 tom Exp $
  *
  *  UCdomap.c
  *  =========
@@ -457,17 +457,12 @@ static int con_insert_unipair(unsigned unicode, unsigned fontpos, int fordefault
     else
 	p1 = uni_pagedir[n = unicode >> 11];
     if (!p1) {
-	p1 = (u16 * *)malloc(32 * sizeof(u16 *));
+	if ((p1 = typecallocn(u16 *, 32)) == NULL)
+	    return ucError;
 	if (fordefault)
 	    unidefault_pagedir[n] = p1;
 	else
 	    uni_pagedir[n] = p1;
-	if (!p1)
-	    return ucError;
-
-	for (i = 0; i < 32; i++) {
-	    p1[i] = NULL;
-	}
     }
 
     if (!(p2 = p1[n = (unicode >> 6) & 0x1f])) {
@@ -488,7 +483,6 @@ static int con_insert_unipair(unsigned unicode, unsigned fontpos, int fordefault
 static int con_insert_unipair_str(unsigned unicode, const char *replace_str,
 				  int fordefault)
 {
-    int i;
     unsigned n;
     char ***p1;
     const char **p2;
@@ -498,31 +492,19 @@ static int con_insert_unipair_str(unsigned unicode, const char *replace_str,
     else
 	p1 = uni_pagedir_str[n = unicode >> 11];
     if (!p1) {
-	p1 = (char ***) malloc(32 * sizeof(char **));
+	if ((p1[n] = typecallocn(char *, 32)) == NULL)
+	      return ucError;
 
 	if (fordefault)
 	    unidefault_pagedir_str[n] = p1;
 	else
 	    uni_pagedir_str[n] = p1;
-	if (!p1)
-	    return ucError;
-
-	for (i = 0; i < 32; i++) {
-	    p1[i] = NULL;
-	}
     }
 
     n = ((unicode >> 6) & 0x1f);
     if (!p1[n]) {
-	p1[n] = (char **) malloc(64 * sizeof(char *));
-
-	if (!p1[n])
-	    return ucError;
-
-	p2 = (const char **) p1[n];
-	for (i = 0; i < 64; i++) {
-	    p2[i] = NULL;	/* No replace string this character (yet) */
-	}
+	if ((p1[n] = typecallocn(char *, 64)) == NULL)
+	      return ucError;
     }
     p2 = (const char **) p1[n];
 
@@ -1736,19 +1718,13 @@ static STRING2PTR UC_setup_LYCharSets_repl(int UC_charset_in_hndl,
     /*
      * Create a temporary table for reverse lookup of latin1 codes:
      */
-    tp = (const char **) malloc(96 * sizeof(char *));
+    if ((tp = typecallocn(const char *, 96)) == NULL)
+	  return NULL;
 
-    if (!tp)
-	return NULL;
-    for (i = 0; i < 96; i++)
-	tp[i] = NULL;
-    ti = (u8 *) malloc(96 * sizeof(u8));
-    if (!ti) {
+    if ((ti = typecallocn(u8, 96)) == NULL) {
 	FREE(tp);
 	return NULL;
     }
-    for (i = 0; i < 96; i++)
-	ti[i] = 0;
 
     pp = UCInfo[UC_charset_in_hndl].unitable;
 
diff --git a/userdefs.h b/userdefs.h
index fbc5db25..5a891be8 100644
--- a/userdefs.h
+++ b/userdefs.h
@@ -1,12 +1,12 @@
 /*
- * $LynxId: userdefs.h,v 1.323 2016/11/24 12:27:19 tom Exp $
+ * $LynxId: userdefs.h,v 1.324 2017/01/02 02:22:38 tom Exp $
  *
  * Lynx - Hypertext navigation system
  *
  *   (c) Copyright 1992, 1993, 1994 University of Kansas
  *	 1995, 1996: GNU General Public License
  *
- *   Copyright 1996-2015,2016 Thomas E. Dickey and Lynx Developers Group
+ *   Copyright 1996-2016,2017 Thomas E. Dickey and Lynx Developers Group
  *   Note: GNU General Public License is not a copyright.
  */
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-12-12 15:51:48 +0000