From: Thomas E. Dickey Date: Sun, 15 Nov 2020 01:01:04 +0000 (+0000) Subject: ncurses 6.2 - patch 20201114 X-Git-Tag: v6.3~52 X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=ee8861cb4901d33fef9ad228b55a60ca4950e79c;ds=sidebyside ncurses 6.2 - patch 20201114 + fix some compiler-warnings in experimental Windows-10 driver. + modify a check for parameters in terminfo capabilities to handle the special case where short extended capability strings were not converted from terminfo to termcap format. + modify CF_MIXEDCASE_FILENAMES macro, adding darwin as special case when cross-compiling (report by Eli Rykoff). --- diff --git a/Ada95/aclocal.m4 b/Ada95/aclocal.m4 index 3cecb0a5..c80b7c88 100644 --- a/Ada95/aclocal.m4 +++ b/Ada95/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey dnl -dnl $Id: aclocal.m4,v 1.163 2020/10/31 20:04:06 tom Exp $ +dnl $Id: aclocal.m4,v 1.164 2020/11/14 15:25:46 tom Exp $ dnl Macros used in NCURSES Ada95 auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -2489,7 +2489,7 @@ AC_SUBST(MAKE_UPPER_TAGS) AC_SUBST(MAKE_LOWER_TAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00 +dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -2498,7 +2498,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) diff --git a/Ada95/configure b/Ada95/configure index cc37f2ed..57096b16 100755 --- a/Ada95/configure +++ b/Ada95/configure @@ -3201,7 +3201,7 @@ else if test "$cross_compiling" = yes ; then case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) diff --git a/NEWS b/NEWS index 1612696e..d886d521 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.3589 2020/11/07 23:52:28 tom Exp $ +-- $Id: NEWS,v 1.3593 2020/11/15 00:33:38 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -46,6 +46,14 @@ 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. +20201114 + + fix some compiler-warnings in experimental Windows-10 driver. + + modify a check for parameters in terminfo capabilities to handle the + special case where short extended capability strings were not + converted from terminfo to termcap format. + + modify CF_MIXEDCASE_FILENAMES macro, adding darwin as special case + when cross-compiling (report by Eli Rykoff). + 20201107 + update kitty+common -TD + add putty+screen and putty-screen (suggested by Alexandre Montaron). diff --git a/VERSION b/VERSION index 446564fa..7652def5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.2 20201107 +5:0:10 6.2 20201114 diff --git a/aclocal.m4 b/aclocal.m4 index c4d5dbc5..4505447f 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -29,7 +29,7 @@ dnl*************************************************************************** dnl dnl Author: Thomas E. Dickey 1995-on dnl -dnl $Id: aclocal.m4,v 1.938 2020/10/31 19:51:56 tom Exp $ +dnl $Id: aclocal.m4,v 1.939 2020/11/14 15:25:03 tom Exp $ dnl Macros used in NCURSES auto-configuration script. dnl dnl These macros are maintained separately from NCURSES. The copyright on @@ -5723,7 +5723,7 @@ ifelse($1,,[ fi ]) dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00 +dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -5732,7 +5732,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) diff --git a/configure b/configure index 1954f0b9..ae6486d4 100755 --- a/configure +++ b/configure @@ -4170,7 +4170,7 @@ else if test "$cross_compiling" = yes ; then case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) diff --git a/dist.mk b/dist.mk index e9b84580..44f3d61a 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.1384 2020/11/07 12:57:22 tom Exp $ +# $Id: dist.mk,v 1.1385 2020/11/14 13:10:13 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 = 2 -NCURSES_PATCH = 20201107 +NCURSES_PATCH = 20201114 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/win32_curses.h b/include/win32_curses.h index b4937cd4..5babf47d 100644 --- a/include/win32_curses.h +++ b/include/win32_curses.h @@ -31,7 +31,7 @@ * Author: Juergen Pfeifer, 2008-on * ****************************************************************************/ -/* $Id: win32_curses.h,v 1.1 2020/08/14 21:57:01 juergen Exp $ */ +/* $Id: win32_curses.h,v 1.2 2020/11/14 23:52:46 tom Exp $ */ /* * This is the interface we use on Windows to mimic the control of the settings @@ -44,8 +44,8 @@ struct winconmode { - unsigned int dwFlagIn; - unsigned int dwFlagOut; + unsigned long dwFlagIn; + unsigned long dwFlagOut; }; extern NCURSES_EXPORT(void*) _nc_console_fd2handle(int fd); diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h index 621167f8..a992bc91 100644 --- a/ncurses/curses.priv.h +++ b/ncurses/curses.priv.h @@ -35,7 +35,7 @@ ****************************************************************************/ /* - * $Id: curses.priv.h,v 1.638 2020/09/12 17:58:55 tom Exp $ + * $Id: curses.priv.h,v 1.639 2020/11/14 23:37:54 tom Exp $ * * curses.priv.h * @@ -1860,7 +1860,7 @@ extern NCURSES_EXPORT(SCREEN *) _nc_retrace_sp (SCREEN *); extern NCURSES_EXPORT(WINDOW *) _nc_retrace_win (WINDOW *); extern NCURSES_EXPORT(attr_t) _nc_retrace_attr_t (attr_t); extern NCURSES_EXPORT(char *) _nc_retrace_ptr (char *); -extern NCURSES_EXPORT(char *) _nc_trace_ttymode(TTY *tty); +extern NCURSES_EXPORT(char *) _nc_trace_ttymode(const TTY *tty); extern NCURSES_EXPORT(char *) _nc_varargs (const char *, va_list); extern NCURSES_EXPORT(chtype) _nc_retrace_chtype (chtype); extern NCURSES_EXPORT(const char *) _nc_altcharset_name(attr_t, chtype); diff --git a/ncurses/tinfo/lib_win32con.c b/ncurses/tinfo/lib_win32con.c index e84f2051..67836d08 100644 --- a/ncurses/tinfo/lib_win32con.c +++ b/ncurses/tinfo/lib_win32con.c @@ -38,7 +38,7 @@ #include -MODULE_ID("$Id: lib_win32con.c,v 1.3 2020/10/10 19:07:10 tom Exp $") +MODULE_ID("$Id: lib_win32con.c,v 1.4 2020/11/14 23:37:16 tom Exp $") #ifdef _NC_WINDOWS @@ -890,7 +890,7 @@ _nc_console_twait( T(("twait:err GetNumberOfConsoleInputEvents")); } if (isNoDelay && b) { - T(("twait: Events Available: %d",nRead)); + T(("twait: Events Available: %ld", nRead)); if (nRead==0) { code=0; goto end; @@ -899,7 +899,7 @@ _nc_console_twait( INPUT_RECORD* pInpRec = TypeAlloca(INPUT_RECORD,nRead); if (pInpRec != NULL) { - int i; + DWORD i; BOOL f; memset(pInpRec,0,sizeof(INPUT_RECORD)*nRead); f = PeekConsoleInput(hdl, pInpRec, nRead, &n); @@ -936,11 +936,11 @@ _nc_console_twait( switch (inp_rec.EventType) { case KEY_EVENT: if (mode & TW_INPUT) { - T(("twait:event KEY_EVENT")); WORD vk = inp_rec.Event.KeyEvent.wVirtualKeyCode; char ch = inp_rec.Event.KeyEvent.uChar.AsciiChar; + T(("twait:event KEY_EVENT")); T(("twait vk=%d, ch=%d, keydown=%d", vk,ch,inp_rec.Event.KeyEvent.bKeyDown)); if (inp_rec.Event.KeyEvent.bKeyDown) { diff --git a/ncurses/trace/lib_tracebits.c b/ncurses/trace/lib_tracebits.c index a760d135..4bc50f3b 100644 --- a/ncurses/trace/lib_tracebits.c +++ b/ncurses/trace/lib_tracebits.c @@ -35,7 +35,7 @@ #include -MODULE_ID("$Id: lib_tracebits.c,v 1.30 2020/09/05 22:54:47 tom Exp $") +MODULE_ID("$Id: lib_tracebits.c,v 1.31 2020/11/14 23:38:11 tom Exp $") #if HAVE_SYS_TERMIO_H #include /* needed for ISC */ @@ -104,7 +104,7 @@ lookup_bits(char *buf, const BITNAMES * table, const char *label, unsigned int v } NCURSES_EXPORT(char *) -_nc_trace_ttymode(TTY * tty) +_nc_trace_ttymode(const TTY * tty) /* describe the state of the terminal control bits exactly */ { char *buf; diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index d643fe51..9cfe4e9a 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20201107) unstable; urgency=low +ncurses6 (6.2+20201114) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 07 Nov 2020 07:57:22 -0500 + -- Thomas E. Dickey Sat, 14 Nov 2020 08:10:13 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index d643fe51..9cfe4e9a 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20201107) unstable; urgency=low +ncurses6 (6.2+20201114) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 07 Nov 2020 07:57:22 -0500 + -- Thomas E. Dickey Sat, 14 Nov 2020 08:10:13 -0500 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index ab1a620f..181a59da 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.2+20201107) unstable; urgency=low +ncurses6 (6.2+20201114) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 07 Nov 2020 07:57:22 -0500 + -- Thomas E. Dickey Sat, 14 Nov 2020 08:10:13 -0500 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 37171b83..d34114ed 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.428 2020/11/07 12:57:22 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.429 2020/11/14 13:10:13 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "2" !define VERSION_YYYY "2020" -!define VERSION_MMDD "1107" +!define VERSION_MMDD "1114" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 5e91f598..ac116973 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.2 -Release: 20201107 +Release: 20201114 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 303a8c38..3a26c353 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.2 -Release: 20201107 +Release: 20201114 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 7084f5b8..3db6e75a 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.2 -Release: 20201107 +Release: 20201114 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/progs/dump_entry.c b/progs/dump_entry.c index e084e0f0..4d3bb142 100644 --- a/progs/dump_entry.c +++ b/progs/dump_entry.c @@ -40,7 +40,7 @@ #include "termsort.c" /* this C file is generated */ #include /* so is this */ -MODULE_ID("$Id: dump_entry.c,v 1.179 2020/07/08 21:21:11 tom Exp $") +MODULE_ID("$Id: dump_entry.c,v 1.180 2020/11/14 18:18:13 tom Exp $") #define DISCARD(string) string = ABSENT_STRING #define PRINTF (void) printf @@ -747,7 +747,7 @@ leading_DYN(DYNBUF * buffer, const char *leading) } bool -has_params(const char *src) +has_params(const char *src, bool formatting) { bool result = FALSE; int len = (int) strlen(src); @@ -765,7 +765,11 @@ has_params(const char *src) } } if (!ifthen) { - result = ((len > 50) && params); + if (formatting) { + result = ((len > 50) && params); + } else { + result = params; + } } return result; } @@ -774,7 +778,7 @@ static char * fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level) { bool percent = FALSE; - bool params = has_params(src); + bool params = has_params(src, TRUE); while (*src != '\0') { switch (*src) { @@ -801,7 +805,7 @@ fmt_complex(TERMTYPE2 *tterm, const char *capability, char *src, int level) strncpy_DYN(&tmpbuf, "%", (size_t) 1); strncpy_DYN(&tmpbuf, src, (size_t) 1); src++; - params = has_params(src); + params = has_params(src, TRUE); if (!params && *src != '\0' && *src != '%') { strncpy_DYN(&tmpbuf, "\n", (size_t) 1); indent_DYN(&tmpbuf, level + 1); @@ -1110,7 +1114,7 @@ fmt_entry(TERMTYPE2 *tterm, ? parametrized[i] : ((*srccap == 'k') ? 0 - : has_params(srccap))); + : has_params(srccap, FALSE))); char *cv = _nc_infotocap(name, srccap, params); if (cv == 0) { diff --git a/progs/dump_entry.h b/progs/dump_entry.h index 984fee70..98551914 100644 --- a/progs/dump_entry.h +++ b/progs/dump_entry.h @@ -34,7 +34,7 @@ ****************************************************************************/ /* - * $Id: dump_entry.h,v 1.42 2020/02/02 23:34:34 tom Exp $ + * $Id: dump_entry.h,v 1.43 2020/11/14 18:16:57 tom Exp $ * * Dump control definitions and variables */ @@ -73,7 +73,7 @@ typedef int (*PredFunc) (PredType, PredIdx); typedef void (*PredHook) (PredType, PredIdx, const char *); extern NCURSES_CONST char *nametrans(const char *); -extern bool has_params(const char *src); +extern bool has_params(const char *, bool); extern int fmt_entry(TERMTYPE2 *, PredFunc, int, int, int, int); extern int show_entry(void); extern void compare_entry(PredHook, TERMTYPE2 *, bool); diff --git a/progs/tic.c b/progs/tic.c index b74d1ce5..c98cda60 100644 --- a/progs/tic.c +++ b/progs/tic.c @@ -49,7 +49,7 @@ #include #include -MODULE_ID("$Id: tic.c,v 1.289 2020/10/31 22:15:55 tom Exp $") +MODULE_ID("$Id: tic.c,v 1.290 2020/11/14 18:16:33 tom Exp $") #define STDIN_NAME "" @@ -2372,7 +2372,7 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value) ? parametrized[i] : ((*value == 'k') ? 0 - : has_params(value))); + : has_params(value, FALSE))); char *ti_value; char *tc_value; bool embedded; diff --git a/test/aclocal.m4 b/test/aclocal.m4 index 81352705..1d2d925b 100644 --- a/test/aclocal.m4 +++ b/test/aclocal.m4 @@ -27,7 +27,7 @@ dnl sale, use or other dealings in this Software without prior written * dnl authorization. * dnl*************************************************************************** dnl -dnl $Id: aclocal.m4,v 1.184 2020/10/31 20:05:07 tom Exp $ +dnl $Id: aclocal.m4,v 1.185 2020/11/14 15:26:19 tom Exp $ dnl dnl Author: Thomas E. Dickey dnl @@ -2339,7 +2339,7 @@ ifelse($1,,[ fi ]) dnl --------------------------------------------------------------------------- -dnl CF_MIXEDCASE_FILENAMES version: 7 updated: 2015/04/12 15:39:00 +dnl CF_MIXEDCASE_FILENAMES version: 8 updated: 2020/11/14 10:12:15 dnl ---------------------- dnl Check if the file-system supports mixed-case filenames. If we're able to dnl create a lowercase name and see it as uppercase, it doesn't support that. @@ -2348,7 +2348,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedcase,[ if test "$cross_compiling" = yes ; then case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*) diff --git a/test/configure b/test/configure index ef110bd8..fe15d930 100755 --- a/test/configure +++ b/test/configure @@ -2874,7 +2874,7 @@ else if test "$cross_compiling" = yes ; then case $target_alias in - (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*) + (*-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw*|*-uwin*|darwin*) cf_cv_mixedcase=no ;; (*)