From 8c3524de1122ce47b3fc6f89769e489cef5a640d Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Wed, 29 Feb 2012 01:38:26 +0000 Subject: [PATCH 1/1] ncurses 5.9 - patch 20120228 + fix breakage in tic/infocmp from 20120225 (report by Werner Fink). --- NEWS | 5 ++++- dist.mk | 4 ++-- progs/dump_entry.c | 10 +++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 80465116..8ad5a14c 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.1866 2012/02/25 20:47:05 tom Exp $ +-- $Id: NEWS,v 1.1867 2012/02/29 01:10:25 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,9 @@ 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. +20120228 + + fix breakage in tic/infocmp from 20120225 (report by Werner Fink). + 20120225 + modify configure script to allow creating dll's for MinGW when cross-compiling. diff --git a/dist.mk b/dist.mk index ff381e1c..3bc49536 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.860 2012/02/25 11:31:29 tom Exp $ +# $Id: dist.mk,v 1.861 2012/02/29 01:09:10 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 = 5 NCURSES_MINOR = 9 -NCURSES_PATCH = 20120225 +NCURSES_PATCH = 20120228 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/progs/dump_entry.c b/progs/dump_entry.c index f62d5c17..6d6efc11 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.97 2012/02/23 00:00:08 tom Exp $") +MODULE_ID("$Id: dump_entry.c,v 1.98 2012/02/29 01:04:17 tom Exp $") #define INDENT 8 #define DISCARD(string) string = ABSENT_STRING @@ -631,7 +631,7 @@ fmt_entry(TERMTYPE *tterm, predval = pred(BOOLEAN, i); if (predval != FAIL) { - _nc_STRCAT(buffer, name, sizeof(buffer)); + _nc_STRCPY(buffer, name, sizeof(buffer)); if (predval <= 0) _nc_STRCAT(buffer, "@", sizeof(buffer)); else if (i + 1 > num_bools) @@ -721,14 +721,14 @@ fmt_entry(TERMTYPE *tterm, if (PRESENT(insert_character) || PRESENT(parm_ich)) { if (SAME_CAP(i, enter_insert_mode) && enter_insert_mode == ABSENT_STRING) { - _nc_STRCAT(buffer, "im=", sizeof(buffer)); + _nc_STRCPY(buffer, "im=", sizeof(buffer)); WRAP_CONCAT; continue; } if (SAME_CAP(i, exit_insert_mode) && exit_insert_mode == ABSENT_STRING) { - _nc_STRCAT(buffer, "ei=", sizeof(buffer)); + _nc_STRCPY(buffer, "ei=", sizeof(buffer)); WRAP_CONCAT; continue; } @@ -860,7 +860,7 @@ fmt_entry(TERMTYPE *tterm, tp[0] = '\0'; if (box_ok) { - _nc_STRCAT(buffer, "box1=", sizeof(buffer)); + _nc_STRCPY(buffer, "box1=", sizeof(buffer)); _nc_STRCAT(buffer, _nc_tic_expand(boxchars, outform == F_TERMINFO, numbers), -- 2.45.0