From: Thomas E. Dickey Date: Sat, 3 Sep 2022 23:59:18 +0000 (+0000) Subject: ncurses 6.3 - patch 20220903 X-Git-Tag: v6.4~18 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=d761c922d94448b16b71061ee5efeb346b744f13 ncurses 6.3 - patch 20220903 + modify verbose-option of infocmp, tic, toe to enable debug-tracing if that is configured. --- diff --git a/NEWS b/NEWS index 0d85c72d..f2f55ba8 100644 --- a/NEWS +++ b/NEWS @@ -26,7 +26,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3851 2022/08/27 19:29:31 tom Exp $ +-- $Id: NEWS,v 1.3853 2022/09/03 21:13:43 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,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. +20220903 + + modify verbose-option of infocmp, tic, toe to enable debug-tracing + if that is configured. + 20220827 + modify configure scripts to use overlooked cases for LD and PKG_CONFIG variables (report by Alan Webb, Gentoo #866398). diff --git a/VERSION b/VERSION index 290b0f4e..07d36739 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.3 20220827 +5:0:10 6.3 20220903 diff --git a/dist.mk b/dist.mk index 7cd25aeb..3474ca0b 100644 --- a/dist.mk +++ b/dist.mk @@ -26,7 +26,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1499 2022/08/27 09:47:02 tom Exp $ +# $Id: dist.mk,v 1.1500 2022/09/03 11:56:16 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -38,7 +38,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 3 -NCURSES_PATCH = 20220827 +NCURSES_PATCH = 20220903 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/tic.h b/include/tic.h index 36169f02..89350592 100644 --- a/include/tic.h +++ b/include/tic.h @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 1998-2012,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: tic.h,v 1.84 2021/08/21 00:24:45 tom Exp $ + * $Id: tic.h,v 1.85 2022/09/03 19:11:20 tom Exp $ * tic.h - Global variables and structures for the terminfo compiler. */ @@ -135,8 +135,7 @@ extern "C" { #define DEBUG_LEVEL(n) ((n) << TRACE_SHIFT) #define set_trace_level(n) \ - _nc_tracing &= DEBUG_LEVEL(MAX_DEBUG_LEVEL) \ - + DEBUG_LEVEL(MAX_DEBUG_LEVEL) - 1, \ + _nc_tracing &= DEBUG_LEVEL(MAX_DEBUG_LEVEL + 1) - 1, \ _nc_tracing |= DEBUG_LEVEL(n) #ifdef TRACE diff --git a/menu/m_post.c b/menu/m_post.c index 1dbd6b80..85da64b6 100644 --- a/menu/m_post.c +++ b/menu/m_post.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2022 Thomas E. Dickey * * Copyright 1998-2010,2012 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -38,7 +38,7 @@ #include "menu.priv.h" -MODULE_ID("$Id: m_post.c,v 1.36 2021/05/08 20:20:01 tom Exp $") +MODULE_ID("$Id: m_post.c,v 1.37 2022/09/03 21:40:27 tom Exp $") /*--------------------------------------------------------------------------- | Facility : libnmenu @@ -203,7 +203,6 @@ _nc_Draw_Menu(const MENU *menu) ITEM *item = menu->items[0]; ITEM *lastvert; ITEM *hitem; - int y = 0; chtype s_bkgd; assert(item && menu->win); @@ -219,6 +218,7 @@ _nc_Draw_Menu(const MENU *menu) { do { + int y = 0; ITEM *lasthor; wmove(menu->win, y, 0); diff --git a/ncurses/base/lib_erase.c b/ncurses/base/lib_erase.c index e190ebd5..aa9437a1 100644 --- a/ncurses/base/lib_erase.c +++ b/ncurses/base/lib_erase.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 1998-2009,2016 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -42,18 +42,18 @@ #include -MODULE_ID("$Id: lib_erase.c,v 1.19 2020/02/02 23:34:34 tom Exp $") +MODULE_ID("$Id: lib_erase.c,v 1.20 2022/09/03 21:40:27 tom Exp $") NCURSES_EXPORT(int) werase(WINDOW *win) { int code = ERR; - NCURSES_CH_T blank; NCURSES_CH_T *start; T((T_CALLED("werase(%p)"), (void *) win)); if (win) { + NCURSES_CH_T blank; NCURSES_CH_T *sp; int y; diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c index 52ebac49..8acdbdd4 100644 --- a/ncurses/tinfo/comp_parse.c +++ b/ncurses/tinfo/comp_parse.c @@ -48,7 +48,7 @@ #include -MODULE_ID("$Id: comp_parse.c,v 1.122 2022/05/08 00:11:44 tom Exp $") +MODULE_ID("$Id: comp_parse.c,v 1.123 2022/09/03 20:02:45 tom Exp $") static void sanity_check2(TERMTYPE2 *, bool); NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2; @@ -61,7 +61,7 @@ enqueue(ENTRY * ep) { ENTRY *newp; - DEBUG(1, (T_CALLED("enqueue(ep=%p)"), (void *) ep)); + DEBUG(2, (T_CALLED("enqueue(ep=%p)"), (void *) ep)); newp = _nc_copy_entry(ep); if (newp == 0) @@ -73,7 +73,7 @@ enqueue(ENTRY * ep) newp->next = 0; if (newp->last) newp->last->next = newp; - DEBUG(1, (T_RETURN(""))); + DEBUG(2, (T_RETURN(""))); } #define NAMEBUFFER_SIZE (MAX_NAME_SIZE + 2) @@ -221,7 +221,7 @@ _nc_read_entry_source(FILE *fp, char *buf, bool oldsuppress = _nc_suppress_warnings; int immediate = 0; - DEBUG(1, + DEBUG(2, (T_CALLED("_nc_read_entry_source(file=%p, buf=%p, literal=%d, silent=%d, hook=%p)"), (void *) fp, buf, literal, silent, (void *) hook)); @@ -273,6 +273,7 @@ _nc_read_entry_source(FILE *fp, char *buf, #endif _nc_suppress_warnings = oldsuppress; + DEBUG(2, (T_RETURN(""))); } #if 0 && NCURSES_XNAMES @@ -457,8 +458,8 @@ _nc_resolve_uses2(bool fullresolve, bool literal) for_entry_list(rp) { if (rp != qp && _nc_name_match(rp->tterm.term_names, lookfor, "|")) { - DEBUG(2, ("%s: resolving use=%s (in core)", - child, lookfor)); + DEBUG(2, ("%s: resolving use=%s %p (in core)", + child, lookfor, lookfor)); qp->uses[i].link = rp; foundit = TRUE; @@ -539,20 +540,22 @@ _nc_resolve_uses2(bool fullresolve, bool literal) for_entry_list(qp) { if (qp->nuses > 0) { - DEBUG(2, ("%s: attempting merge", - _nc_first_name(qp->tterm.term_names))); + DEBUG(2, ("%s: attempting merge of %d entries", + _nc_first_name(qp->tterm.term_names), + qp->nuses)); /* * If any of the use entries we're looking for is * incomplete, punt. We'll catch this entry on a * subsequent pass. */ - for (i = 0; i < qp->nuses; i++) + for (i = 0; i < qp->nuses; i++) { if (qp->uses[i].link && qp->uses[i].link->nuses) { DEBUG(2, ("%s: use entry %d unresolved", _nc_first_name(qp->tterm.term_names), i)); goto incomplete; } + } /* * First, make sure there is no garbage in the diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 60fa2926..fac4b3e4 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220827) unstable; urgency=low +ncurses6 (6.3+20220903) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 27 Aug 2022 05:47:02 -0400 + -- Thomas E. Dickey Sat, 03 Sep 2022 07:56:16 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 60fa2926..fac4b3e4 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220827) unstable; urgency=low +ncurses6 (6.3+20220903) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 27 Aug 2022 05:47:02 -0400 + -- Thomas E. Dickey Sat, 03 Sep 2022 07:56:16 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index c43427b5..24f55690 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.3+20220827) unstable; urgency=low +ncurses6 (6.3+20220903) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 27 Aug 2022 05:47:02 -0400 + -- Thomas E. Dickey Sat, 03 Sep 2022 07:56:16 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 06f0f188..140f2909 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.539 2022/08/27 09:47:02 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.540 2022/09/03 11:56:16 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "3" !define VERSION_YYYY "2022" -!define VERSION_MMDD "0827" +!define VERSION_MMDD "0903" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index d2d154bc..a1018ff9 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.3 -Release: 20220827 +Release: 20220903 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index c059e1ee..c5db7adf 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.3 -Release: 20220827 +Release: 20220903 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 477fb8e5..09aba06c 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.3 -Release: 20220827 +Release: 20220903 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/infocmp.c b/progs/infocmp.c index 0ee0b958..c1b95088 100644 --- a/progs/infocmp.c +++ b/progs/infocmp.c @@ -43,7 +43,7 @@ #include -MODULE_ID("$Id: infocmp.c,v 1.153 2022/03/05 16:15:48 tom Exp $") +MODULE_ID("$Id: infocmp.c,v 1.155 2022/09/03 23:28:48 tom Exp $") #define MAX_STRING 1024 /* maximum formatted string */ @@ -1727,7 +1727,7 @@ main(int argc, char *argv[]) case 'v': itrace = (unsigned) optarg_to_number(); - set_trace_level(itrace); + use_verbosity(itrace); break; case 'W': diff --git a/progs/progs.priv.h b/progs/progs.priv.h index 32f4e4e8..3c44a890 100644 --- a/progs/progs.priv.h +++ b/progs/progs.priv.h @@ -31,7 +31,7 @@ * Author: Thomas E. Dickey 1997-on * ****************************************************************************/ /* - * $Id: progs.priv.h,v 1.53 2021/06/26 20:43:19 tom Exp $ + * $Id: progs.priv.h,v 1.54 2022/09/03 23:28:26 tom Exp $ * * progs.priv.h * @@ -234,6 +234,12 @@ extern int optind; #define SIZEOF(v) (sizeof(v)/sizeof(v[0])) +#ifdef TRACE +#define use_verbosity(level) do { set_trace_level(level); if (_nc_tracing) _nc_tracing |= TRACE_MAXIMUM; } while (0) +#else +#define use_verbosity(level) do { set_trace_level(level); } while (0) +#endif + #define NCURSES_EXT_NUMBERS (NCURSES_EXT_COLORS && HAVE_INIT_EXTENDED_COLOR) #if NCURSES_EXT_NUMBERS diff --git a/progs/tic.c b/progs/tic.c index 6f562126..cb7baf07 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -49,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.315 2022/07/02 20:40:22 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.318 2022/09/03 23:29:16 tom Exp $") #define STDIN_NAME "" @@ -775,7 +775,7 @@ main(int argc, char *argv[]) break; case 'D': debug_level = VtoTrace(v_opt); - set_trace_level(debug_level); + use_verbosity(debug_level); show_databases(outdir); ExitProgram(EXIT_SUCCESS); break; @@ -864,7 +864,7 @@ main(int argc, char *argv[]) } debug_level = VtoTrace(v_opt); - set_trace_level(debug_level); + use_verbosity(debug_level); if (_nc_tracing) { save_check_termtype = _nc_check_termtype2; diff --git a/progs/toe.c b/progs/toe.c index 92819c19..7599cfe3 100644 --- a/progs/toe.c +++ b/progs/toe.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2020,2021 Thomas E. Dickey * + * Copyright 2018-2021,2022 Thomas E. Dickey * * Copyright 1998-2013,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -45,7 +45,7 @@ #include #endif -MODULE_ID("$Id: toe.c,v 1.86 2021/10/10 00:55:32 tom Exp $") +MODULE_ID("$Id: toe.c,v 1.88 2022/09/03 23:29:32 tom Exp $") #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, "..")) @@ -658,7 +658,7 @@ main(int argc, char *argv[]) usage(); } } - set_trace_level(v_opt); + use_verbosity(v_opt); if (report_file != 0) { if (freopen(report_file, "r", stdin) == 0) { diff --git a/test/ins_wide.c b/test/ins_wide.c index 9f733924..c99b19d6 100644 --- a/test/ins_wide.c +++ b/test/ins_wide.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020 Thomas E. Dickey * + * Copyright 2020,2022 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: ins_wide.c,v 1.25 2020/02/02 23:34:34 tom Exp $ + * $Id: ins_wide.c,v 1.26 2022/09/03 21:40:27 tom Exp $ * * Demonstrate the wins_wstr() and wins_wch functions. * Thomas Dickey - 2002/11/23 @@ -106,7 +106,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *buffer, int length, int margin) { int n; int result; diff --git a/test/test_add_wchstr.c b/test/test_add_wchstr.c index b1d320bb..b1605046 100644 --- a/test/test_add_wchstr.c +++ b/test/test_add_wchstr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2020,2021 Thomas E. Dickey * + * Copyright 2020-2021,2022 Thomas E. Dickey * * Copyright 2009-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: test_add_wchstr.c,v 1.29 2021/05/08 20:04:10 tom Exp $ + * $Id: test_add_wchstr.c,v 1.30 2022/09/03 21:40:27 tom Exp $ * * Demonstrate the waddwchstr() and wadd_wch functions. * Thomas Dickey - 2009/9/12 @@ -191,7 +191,7 @@ legend(WINDOW *win, int level, Options state, wchar_t *buffer, int length) } static int -ColOf(wchar_t *buffer, int length, int margin) +ColOf(const wchar_t *buffer, int length, int margin) { int n; int result;