From: Thomas E. Dickey Date: Sun, 18 Nov 2018 00:22:59 +0000 (+0000) Subject: ncurses 6.1 - patch 20181117 X-Git-Tag: v6.2~64 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=bf5877fb3d0985dcde0e71f52be87d865f76a7ca ncurses 6.1 - patch 20181117 + ignore the hex/b64 $TERMINFO in toe's listing. + correct a status-check in _nc_read_tic_entry() so that if reading a hex/b64 $TERMINFO, and the $TERM does not match, fall-through to the compiled-in search list. --- diff --git a/NEWS b/NEWS index 2c0b87eb..9d0080f7 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.3211 2018/11/11 01:36:45 tom Exp $ +-- $Id: NEWS,v 1.3214 2018/11/17 22:45:23 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,12 @@ 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. +20181117 + + ignore the hex/b64 $TERMINFO in toe's listing. + + correct a status-check in _nc_read_tic_entry() so that if reading + a hex/b64 $TERMINFO, and the $TERM does not match, fall-through to + the compiled-in search list. + 20181110 + several workarounds to ensure proper C compiler used in parts of Ada95 tree. diff --git a/VERSION b/VERSION index 30b506a5..49af1a1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20181110 +5:0:10 6.1 20181117 diff --git a/dist.mk b/dist.mk index 90cd4191..f5c59c58 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.1250 2018/11/10 17:09:13 tom Exp $ +# $Id: dist.mk,v 1.1251 2018/11/17 15:41:00 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 = 1 -NCURSES_PATCH = 20181110 +NCURSES_PATCH = 20181117 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c index e56c5a1f..3b020992 100644 --- a/ncurses/tinfo/read_entry.c +++ b/ncurses/tinfo/read_entry.c @@ -41,7 +41,7 @@ #include -MODULE_ID("$Id: read_entry.c,v 1.148 2018/04/14 17:43:37 tom Exp $") +MODULE_ID("$Id: read_entry.c,v 1.150 2018/11/17 21:40:10 tom Exp $") #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts)) @@ -749,10 +749,13 @@ _nc_read_tic_entry(char *filename, (T_CALLED("_nc_read_tic_entry(file=%p, path=%s, name=%s)"), filename, path, name)); + assert(TGETENT_YES == TRUE); /* simplify call for _nc_name_match */ + if ((used = decode_quickdump(buffer, path)) != 0 && (code = _nc_read_termtype(tp, buffer, used)) == TGETENT_YES - && _nc_name_match(tp->term_names, name, "|")) { + && (code = _nc_name_match(tp->term_names, name, "|")) == TGETENT_YES) { TR(TRACE_DATABASE, ("loaded quick-dump for %s", name)); + strcpy(filename, "$TERMINFO"); /* shorten name shown by infocmp */ } else #if USE_HASHED_DB if (make_db_filename(filename, limit, path) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index a3a212d8..1a205265 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20181110) unstable; urgency=low +ncurses6 (6.1+20181117) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 10 Nov 2018 12:09:14 -0500 + -- Thomas E. Dickey Sat, 17 Nov 2018 10:41:00 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index a3a212d8..1a205265 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20181110) unstable; urgency=low +ncurses6 (6.1+20181117) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 10 Nov 2018 12:09:14 -0500 + -- Thomas E. Dickey Sat, 17 Nov 2018 10:41:00 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 620ae6b3..1f88275c 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20181110) unstable; urgency=low +ncurses6 (6.1+20181117) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 10 Nov 2018 12:09:14 -0500 + -- Thomas E. Dickey Sat, 17 Nov 2018 10:41:00 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 8abcc5e9..9d801cbe 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.297 2018/11/10 17:09:13 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.298 2018/11/17 15:41:00 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "1" !define VERSION_YYYY "2018" -!define VERSION_MMDD "1110" +!define VERSION_MMDD "1117" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index ad99d487..f673d2cb 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.1 -Release: 20181110 +Release: 20181117 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 5cf9d2c1..b3c22c77 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.1 -Release: 20181110 +Release: 20181117 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index e400219b..c140e94c 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.1 -Release: 20181110 +Release: 20181117 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/toe.c b/progs/toe.c index 5abb46de..7b9f79ad 100644 --- a/progs/toe.c +++ b/progs/toe.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc. * + * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * * copy of this software and associated documentation files (the * @@ -44,7 +44,7 @@ #include #endif -MODULE_ID("$Id: toe.c,v 1.77 2017/12/23 19:23:40 tom Exp $") +MODULE_ID("$Id: toe.c,v 1.78 2018/11/17 22:41:46 tom Exp $") #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) @@ -497,8 +497,8 @@ typelist(int eargc, char *eargv[], } } } -#endif -#endif +#endif /* USE_HASHED_DB */ +#endif /* NCURSES_USE_DATABASE */ #if NCURSES_USE_TERMCAP #if HAVE_BSD_CGETENT { @@ -700,6 +700,8 @@ main(int argc, char *argv[]) _nc_first_db(&state, &offset); while ((path = _nc_next_db(&state, &offset)) != 0) { + if (quick_prefix(path)) + continue; if (pass) { eargv[count] = strmalloc(path); } @@ -725,7 +727,8 @@ main(int argc, char *argv[]) failed("eargv"); _nc_first_db(&state, &offset); if ((path = _nc_next_db(&state, &offset)) != 0) { - eargv[count++] = strmalloc(path); + if (!quick_prefix(path)) + eargv[count++] = strmalloc(path); } code = typelist((int) count, eargv, header, hook);