]> ncurses.scripts.mit.edu Git - ncurses.git/commitdiff
projects / ncurses.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2b7c2fd)
ncurses 6.2 - patch 20200907
authorThomas E. Dickey <dickey@invisible-island.net>
Mon, 7 Sep 2020 23:37:37 +0000 (23:37 +0000)
committerThomas E. Dickey <dickey@invisible-island.net>
Mon, 7 Sep 2020 23:37:37 +0000 (23:37 +0000)
+ fix regression in setupterm validating non-empty $TERM (report by
  Soren Tempel).

14 files changed:
NEWS patch | blob | history
VERSION patch | blob | history
dist.mk patch | blob | history
include/nc_win32.h patch | blob | history
ncurses/base/lib_initscr.c patch | blob | history
ncurses/curses.priv.h patch | blob | history
ncurses/tinfo/lib_setup.c patch | blob | history
package/debian-mingw/changelog patch | blob | history
package/debian-mingw64/changelog patch | blob | history
package/debian/changelog patch | blob | history
package/mingw-ncurses.nsi patch | blob | history
package/mingw-ncurses.spec patch | blob | history
package/ncurses.spec patch | blob | history
package/ncursest.spec patch | blob | history

diff --git a/NEWS b/NEWS
index b81abe733abce8ac6769f4348ce40c6f027c36f1..d3fbc8341ce9cd432c8d0fc3277fe2781e32abfe 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.3556 2020/09/06 20:05:44 tom Exp $
+-- $Id: NEWS,v 1.3558 2020/09/07 16:47:17 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20200907
+       + fix regression in setupterm validating non-empty $TERM (report by
+         Soren Tempel).
+
 20200906
        + merge/adapt in-progress work by Juergen Pfeifer for new version of
          win32-driver.
 20200906
        + merge/adapt in-progress work by Juergen Pfeifer for new version of
          win32-driver.
diff --git a/VERSION b/VERSION
index 074a91741c7305bbf3de4989d98598f8a7c02dc2..2fc48a8bb1a2cb5e9c61ba3d8ddee34b59c949a5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20200906
+5:0:10 6.2     20200907
diff --git a/dist.mk b/dist.mk
index 382761aa5ac183c296a58887bf80ca33009e767b..c6edb9e0d99a8367b59b579dbf6f245e58f985cb 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.1373 2020/09/06 20:05:44 tom Exp $
+# $Id: dist.mk,v 1.1374 2020/09/07 14:22:04 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
-NCURSES_PATCH = 20200906
+NCURSES_PATCH = 20200907
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/include/nc_win32.h b/include/nc_win32.h
index 8fa3986981c6dd12786322e4cbc25fe08d6d56c1..1a0ba495913e16c5cb8e786183adb0615a3faf89 100644 (file)
--- a/include/nc_win32.h
+++ b/include/nc_win32.h
@@ -31,7 +31,7 @@
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
  * Author: Thomas Dickey, 2008-on                                           *
  ****************************************************************************/
 
-/* $Id: nc_win32.h,v 1.7 2020/09/06 20:53:55 tom Exp $ */
+/* $Id: nc_win32.h,v 1.8 2020/09/07 14:27:05 tom Exp $ */
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
 
 #ifndef NC_WIN32_H
 #define NC_WIN32_H 1
@@ -107,15 +107,15 @@ extern NCURSES_EXPORT(int)    _nc_console_vt_supported(void);
 extern NCURSES_EXPORT(int)    _nc_console_checkmintty(int fd, LPHANDLE pMinTTY);
 #endif
 
 extern NCURSES_EXPORT(int)    _nc_console_checkmintty(int fd, LPHANDLE pMinTTY);
 #endif
 
-#undef CHECK_TERM_ENV
+#undef VALID_TERM_ENV
 #define MS_TERMINAL "ms-terminal"
 #define MS_TERMINAL "ms-terminal"
-#define CHECK_TERM_ENV(term_env, no_terminal) \
+#define VALID_TERM_ENV(term_env, no_terminal) \
        (term_env = (NonEmpty(term_env) \
                      ? term_env \
                      : (_nc_console_vt_supported() \
                         ? MS_TERMINAL \
                         : no_terminal)), \
        (term_env = (NonEmpty(term_env) \
                      ? term_env \
                      : (_nc_console_vt_supported() \
                         ? MS_TERMINAL \
                         : no_terminal)), \
-        !NonEmpty(term_env))
+        NonEmpty(term_env))
 
   /*
    * Various Console mode definitions
 
   /*
    * Various Console mode definitions
diff --git a/ncurses/base/lib_initscr.c b/ncurses/base/lib_initscr.c
index f663819d599d8fd96d350ce0f4cb0798f3c2f189..6b91491355011cd9541b275cf1a10c79c8a8b1f4 100644 (file)
--- a/ncurses/base/lib_initscr.c
+++ b/ncurses/base/lib_initscr.c
@@ -46,7 +46,7 @@
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
 #include <sys/termio.h>                /* needed for ISC */
 #endif
 
-MODULE_ID("$Id: lib_initscr.c,v 1.47 2020/09/06 20:48:55 tom Exp $")
+MODULE_ID("$Id: lib_initscr.c,v 1.48 2020/09/07 14:26:48 tom Exp $")
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
 
 NCURSES_EXPORT(WINDOW *)
 initscr(void)
@@ -67,7 +67,7 @@ initscr(void)
        _nc_globals.init_screen = TRUE;
 
        env = getenv("TERM");
        _nc_globals.init_screen = TRUE;
 
        env = getenv("TERM");
-       (void) CHECK_TERM_ENV(env, "unknown");
+       (void) VALID_TERM_ENV(env, "unknown");
 
        if ((name = strdup(env)) == NULL) {
            fprintf(stderr, "Error opening allocating $TERM.\n");
 
        if ((name = strdup(env)) == NULL) {
            fprintf(stderr, "Error opening allocating $TERM.\n");
diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 1390221e90e9152e74445931f877de4188dea50c..0fea513c6538dc8da494fcf3ab462d9daff2675a 100644 (file)
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -35,7 +35,7 @@
  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*
- * $Id: curses.priv.h,v 1.636 2020/09/06 20:53:41 tom Exp $
+ * $Id: curses.priv.h,v 1.637 2020/09/07 14:27:13 tom Exp $
  *
  *     curses.priv.h
  *
  *
  *     curses.priv.h
  *
@@ -297,11 +297,11 @@ extern NCURSES_EXPORT(void *) _nc_memmove (void *, const void *, size_t);
 #define NO_TERMINAL 0
 #endif
 
 #define NO_TERMINAL 0
 #endif
 
-#define CHECK_TERM_ENV(term_env, no_terminal) \
+#define VALID_TERM_ENV(term_env, no_terminal) \
        (term_env = (NonEmpty(term_env) \
                     ? term_env \
                     : no_terminal), \
        (term_env = (NonEmpty(term_env) \
                     ? term_env \
                     : no_terminal), \
-        !NonEmpty(term_env))
+        NonEmpty(term_env))
 
 /*
  * Note:  ht/cbt expansion flakes out randomly under Linux 1.1.47, but only
 
 /*
  * Note:  ht/cbt expansion flakes out randomly under Linux 1.1.47, but only
diff --git a/ncurses/tinfo/lib_setup.c b/ncurses/tinfo/lib_setup.c
index 73e5a3231d259dd24ebc687d9967d53f56237b5d..19c65357094230cb9504abfafc41e303fea36dee 100644 (file)
--- a/ncurses/tinfo/lib_setup.c
+++ b/ncurses/tinfo/lib_setup.c
@@ -49,7 +49,7 @@
 #include <locale.h>
 #endif
 
 #include <locale.h>
 #endif
 
-MODULE_ID("$Id: lib_setup.c,v 1.210 2020/09/06 21:03:33 tom Exp $")
+MODULE_ID("$Id: lib_setup.c,v 1.211 2020/09/07 16:37:19 tom Exp $")
 
 /****************************************************************************
  *
 
 /****************************************************************************
  *
@@ -663,12 +663,17 @@ TINFO_SETUP_TERM(TERMINAL **tp,
 
     if (tname == 0) {
        tname = getenv("TERM");
 
     if (tname == 0) {
        tname = getenv("TERM");
-#if defined(USE_TERM_DRIVER) && !defined(EXP_WIN32_DRIVER)
+#if defined(EXP_WIN32_DRIVER)
+       if (!VALID_TERM_ENV(tname, NO_TERMINAL)) {
+           T(("Failure with TERM=%s", NonNull(tname)));
+           ret_error0(TGETENT_ERR, "TERM environment variable not set.\n");
+       }
+#elif defined(USE_TERM_DRIVER)
        if (!NonEmpty(tname))
            tname = "unknown";
 #else
        if (!NonEmpty(tname))
            tname = "unknown";
 #else
-       if (!CHECK_TERM_ENV(tname, NO_TERMINAL)) {
-           T(("Failure with TERM=%s", tname));
+       if (!NonEmpty(tname)) {
+           T(("Failure with TERM=%s", NonNull(tname)));
            ret_error0(TGETENT_ERR, "TERM environment variable not set.\n");
        }
 #endif
            ret_error0(TGETENT_ERR, "TERM environment variable not set.\n");
        }
 #endif
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 81f939be323ce7db53798fe74146b9b23dae7139..63fc4333ce90580bb80a14ebabed5cd0b8eb49e4 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200906) unstable; urgency=low
+ncurses6 (6.2+20200907) unstable; urgency=low
 
   * latest weekly patch
 
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Sep 2020 16:05:44 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 07 Sep 2020 10:22:04 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 81f939be323ce7db53798fe74146b9b23dae7139..63fc4333ce90580bb80a14ebabed5cd0b8eb49e4 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200906) unstable; urgency=low
+ncurses6 (6.2+20200907) unstable; urgency=low
 
   * latest weekly patch
 
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Sep 2020 16:05:44 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 07 Sep 2020 10:22:04 -0400
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
diff --git a/package/debian/changelog b/package/debian/changelog
index fbfc23d047c3089d72143595d5a4ecb816c00e5e..7a244ad038a90753175ecef8f324ee371f2f80d5 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200906) unstable; urgency=low
+ncurses6 (6.2+20200907) unstable; urgency=low
 
   * latest weekly patch
 
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 06 Sep 2020 16:05:44 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Mon, 07 Sep 2020 10:22:04 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index fcc75b5e6cfc0fb27609e551334ba95005399653..8305862af1cbd9ae67e8c1faf831683be23ad7b2 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.417 2020/09/06 20:05:44 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.418 2020/09/07 14:22:04 tom Exp $\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r
-!define VERSION_MMDD  "0906"\r
+!define VERSION_MMDD  "0907"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index fa77f55d201498e087153b9f69acfdb4a8e64d75..fd755ce95d20ad2e4c728913241c1b95423ab3e4 100644 (file)
--- 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
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2
-Release: 20200906
+Release: 20200907
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncurses.spec b/package/ncurses.spec
index a665987eababa63c31c44470466277b74352c4c2..44c7e6f63381acce1d3dfb7e66a59149ca459430 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
-Release: 20200906
+Release: 20200907
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/package/ncursest.spec b/package/ncursest.spec
index 37aae7aa35f10837fd933dbb0b05a4d7b543470a..fdf1bc7d58c76129b175601b19f412aa8821d646 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
-Release: 20200906
+Release: 20200907
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
ncurses, with patches starting at ncurses-5.6; new users should use https://github.com/ThomasDickey/ncurses-snapshots/