ncurses 6.0 - patch 20170708

+ add a note to tic manual page about -W versus -f options.
+ correct a limit-check in fixes from 20170701 (report by Sven Joachim).

diff --git a/NEWS b/NEWS
index ff89818495e2a0dddc3660e8540ea302ced0cda5..c2cf28114ca23161dcb09b6911310cea3ef56ad0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.2878 2017/07/01 22:57:06 tom Exp $
+-- $Id: NEWS,v 1.2882 2017/07/09 00:25:16 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20170708
+       + add a note to tic manual page about -W versus -f options.
+       + correct a limit-check in fixes from 20170701 (report by Sven Joachim).
+

 20170701
        + modify update_getenv() in db_iterator.c to ensure that environment
          variables which are not initially set will be checked later if an
 20170701
        + modify update_getenv() in db_iterator.c to ensure that environment
          variables which are not initially set will be checked later if an

diff --git a/VERSION b/VERSION
index 201bd96267490caf09a5f6cda163f2a33aa064ab..e3d69d2996c70be56848755a2a3b47d389334554 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:9  6.0     20170701
+5:0:9  6.0     20170708

diff --git a/dist.mk b/dist.mk
index e94aae520f087d9ea2ae4870c903167619e27d70..09d7aca21ecac4a5e358eca81b1954bba764058e 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1170 2017/06/25 16:16:02 tom Exp $
+# $Id: dist.mk,v 1.1171 2017/07/02 14:32:53 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 0

-NCURSES_PATCH = 20170701
+NCURSES_PATCH = 20170708

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/man/tic.1m b/man/tic.1m
index d0c42b950ec01f06456bd31c96535afe053ec9af..c3322e6703e2ea5e8834622280a5889a2f4ca1f7 100644 (file)
--- a/man/tic.1m
+++ b/man/tic.1m
@@ -26,7 +26,7 @@
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"
 .\" authorization.                                                           *
 .\"***************************************************************************
 .\"

-.\" $Id: tic.1m,v 1.63 2017/01/14 19:50:09 tom Exp $
+.\" $Id: tic.1m,v 1.65 2017/07/08 19:48:37 tom Exp $

 .TH @TIC@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``
 .TH @TIC@ 1M ""
 .ie \n(.g .ds `` \(lq
 .el       .ds `` ``


@@ -345,6 +345,9 @@ If the debug level \fIn\fR is not given, it is taken to be one.
 \fB\-W\fR
 By itself, the \fB\-w\fP option will not force long strings to be wrapped.
 Use the \fB\-W\fP option to do this.
 \fB\-W\fR
 By itself, the \fB\-w\fP option will not force long strings to be wrapped.
 Use the \fB\-W\fP option to do this.

+.IP
+If you specify both \fB\-f\fP and \fB\-W\fP options,
+the latter is ignored when \fB\-f\fP has already split the line.

 .TP
 \fB\-w\fR\fIn\fR
 specifies the width of the output.
 .TP
 \fB\-w\fR\fIn\fR
 specifies the width of the output.

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index ff06b3831b9c530ce235028cea99380d666a7aa2..f94a865dd4779f93673c8b560c02575b00c91262 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170701) unstable; urgency=low
+ncurses6 (6.0+20170708) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2017 12:16:02 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 02 Jul 2017 10:32:53 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index ff06b3831b9c530ce235028cea99380d666a7aa2..f94a865dd4779f93673c8b560c02575b00c91262 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170701) unstable; urgency=low
+ncurses6 (6.0+20170708) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2017 12:16:02 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 02 Jul 2017 10:32:53 -0400

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index 562ae4082f9f9932cd7b3551992f4aea5ababd11..39e01c1a3d415b44442a1651e7fde586af649aea 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.0+20170701) unstable; urgency=low
+ncurses6 (6.0+20170708) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 25 Jun 2017 12:16:02 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 02 Jul 2017 10:32:53 -0400

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 82c5949637a047ccb675b8a56f059ef867c1e5aa..ab481a9c200f54fe8484539ab75a092f01474b32 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.218 2017/06/25 16:16:02 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.219 2017/07/02 14:32:53 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "0"\r
 !define VERSION_YYYY  "2017"\r

-!define VERSION_MMDD  "0701"\r
+!define VERSION_MMDD  "0708"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 803511d6c76218bcce62745be88f7ba79d39654e..7b55116df83c8dc75230867fcbcf5d61cd512622 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.0

-Release: 20170701
+Release: 20170708

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index 2516e3c565b5d2d44201d8140df82428bbd6a9e1..d7b8f98e0fa76b56dd4087c8e80b47572bc0445f 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.0

-Release: 20170701
+Release: 20170708

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index 600fda9aed810539047e00628a7f43d16d58a3c1..e21e05e03516227b3beb4b383b7a73185a865500 100644 (file)
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -39,7 +39,7 @@
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 

-MODULE_ID("$Id: dump_entry.c,v 1.154 2017/07/01 11:27:29 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.155 2017/07/08 18:34:53 tom Exp $")

 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf
 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf


@@ -1054,7 +1054,7 @@ fmt_entry(TERMTYPE2 *tterm,
                        char *s = srccap, *d = buffer;
                        WRAP_CONCAT3("..", name, "=");
                        while ((*d = *s++) != 0) {
                        char *s = srccap, *d = buffer;
                        WRAP_CONCAT3("..", name, "=");
                        while ((*d = *s++) != 0) {

-                           if ((d - buffer - 1) >= (int) sizeof(buffer)) {
+                           if ((d - buffer + 1) >= (int) sizeof(buffer)) {

                                fprintf(stderr,
                                        "%s: value for %s is too long\n",
                                        _nc_progname,
                                fprintf(stderr,
                                        "%s: value for %s is too long\n",
                                        _nc_progname,