From: Thomas E. Dickey Date: Sun, 9 Jul 2017 01:27:08 +0000 (+0000) Subject: ncurses 6.0 - patch 20170708 X-Git-Tag: v6.1~29 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=fb6c095b1b63de26712d67de11dc6e35ea223f16 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 ff898184..c2cf2811 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- 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 @@ -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. +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 diff --git a/VERSION b/VERSION index 201bd962..e3d69d29 100644 --- 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 e94aae52..09d7aca2 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # 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 @@ -37,7 +37,7 @@ SHELL = /bin/sh # 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) diff --git a/man/tic.1m b/man/tic.1m index d0c42b95..c3322e67 100644 --- a/man/tic.1m +++ b/man/tic.1m @@ -26,7 +26,7 @@ .\" 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 `` `` @@ -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. +.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. diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index ff06b383..f94a865d 100644 --- 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 - -- Thomas E. Dickey Sun, 25 Jun 2017 12:16:02 -0400 + -- Thomas E. Dickey Sun, 02 Jul 2017 10:32:53 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index ff06b383..f94a865d 100644 --- 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 - -- Thomas E. Dickey Sun, 25 Jun 2017 12:16:02 -0400 + -- Thomas E. Dickey Sun, 02 Jul 2017 10:32:53 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 562ae408..39e01c1a 100644 --- 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 - -- Thomas E. Dickey Sun, 25 Jun 2017 12:16:02 -0400 + -- Thomas E. Dickey Sun, 02 Jul 2017 10:32:53 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 82c59496..ab481a9c 100644 --- 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 $ +; $Id: mingw-ncurses.nsi,v 1.219 2017/07/02 14:32:53 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "0" !define VERSION_YYYY "2017" -!define VERSION_MMDD "0701" +!define VERSION_MMDD "0708" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 803511d6..7b55116d 100644 --- 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 -Release: 20170701 +Release: 20170708 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 2516e3c5..d7b8f98e 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ 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 diff --git a/progs/dump_entry.c b/progs/dump_entry.c index 600fda9a..e21e05e0 100644 --- a/progs/dump_entry.c +++ b/progs/dump_entry.c @@ -39,7 +39,7 @@ #include "termsort.c" /* this C file is generated */ #include /* 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 @@ -1054,7 +1054,7 @@ fmt_entry(TERMTYPE2 *tterm, 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,