ncurses 6.1 - patch 20190420

+ improve ifdef's for TABSIZE variable, to help with AIX/HPUX ports.

diff --git a/NEWS b/NEWS
index 95276710ea3e8a9b58dd6c2cdf78ff315946748e..572b75b879da70a1fd7800e957c236b563a4ba0d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,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.3308 2019/04/13 22:55:07 tom Exp $
+-- $Id: NEWS,v 1.3310 2019/04/20 20:23:58 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


@@ -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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20190420
+       + improve ifdef's for TABSIZE variable, to help with AIX/HPUX ports.
+

 20190413
        + check for TABSIZE variable in test/configure script.
        + used test/test_arrays.c to improve Caps.aix1 and Caps.hpux11
 20190413
        + check for TABSIZE variable in test/configure script.
        + used test/test_arrays.c to improve Caps.aix1 and Caps.hpux11

diff --git a/VERSION b/VERSION
index 090e7739cd407df931351acfb6dd5007985e9457..ad875c89b1c170fff663a7cb8c7d1f0d3444ac99 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20190413
+5:0:10 6.1     20190420

diff --git a/dist.mk b/dist.mk
index 18c454ad74e3e0ea3b35835f827065fb06f6e236..f8aa05430421f48face60a671ef160925037cc48 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,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.1278 2019/04/13 15:23:45 tom Exp $
+# $Id: dist.mk,v 1.1279 2019/04/20 15:00:19 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


@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 1

-NCURSES_PATCH = 20190413
+NCURSES_PATCH = 20190420

 
 # 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/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 6c1b9b4c0499ca7954ae31b35e9f34c8ed00d856..1bf383a8b4482817e57abb4fd1bb5fcbb27ada92 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190413) unstable; urgency=low
+ncurses6 (6.1+20190420) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2019 11:23:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2019 11:00:19 -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 6c1b9b4c0499ca7954ae31b35e9f34c8ed00d856..1bf383a8b4482817e57abb4fd1bb5fcbb27ada92 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190413) unstable; urgency=low
+ncurses6 (6.1+20190420) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2019 11:23:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2019 11:00:19 -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 f35d521f6cc129f2affd85cc7df64563d989c759..008725cd92924f8dc09622fa46a498ea903f3072 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20190413) unstable; urgency=low
+ncurses6 (6.1+20190420) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Apr 2019 11:23:45 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 20 Apr 2019 11:00:19 -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 67c85bea0e2c4521006501fedc38c2ddc4eb8926..04703cf9bc770e48ed85f555244311a11112151c 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.324 2019/04/13 15:23:45 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.325 2019/04/20 15:00:19 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 "1"\r
 !define VERSION_YYYY  "2019"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2019"\r

-!define VERSION_MMDD  "0413"\r
+!define VERSION_MMDD  "0420"\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 c2d41c500c387b8fb6e73de2825a9f635809055b..927e2438a6c6165fd16f75e294da777a6d080f47 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.1
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.1

-Release: 20190413
+Release: 20190420

 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 7e0c0bbef751bd1a99afa2005c445d6608d7615a..2c2dad13e16af8b8b9f4ec105653a07c14732de4 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.1

-Release: 20190413
+Release: 20190420

 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 360834ee696f2f51020eb905e980673ca3216ea4..a0faa12e2fff9117705570b362379576fe1a5da5 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.1
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.1

-Release: 20190413
+Release: 20190420

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/progs/dump_entry.c b/progs/dump_entry.c
index 60a3d95670359da88dbf660c21a63328c1281ac5..66b250b9d31dc6c0e1a9be980046b26802725d79 100644 (file)
--- a/progs/dump_entry.c
+++ b/progs/dump_entry.c
@@ -39,7 +39,7 @@
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 
 #include "termsort.c"          /* this C file is generated */
 #include <parametrized.h>      /* so is this */
 

-MODULE_ID("$Id: dump_entry.c,v 1.171 2019/01/21 15:11:51 tom Exp $")
+MODULE_ID("$Id: dump_entry.c,v 1.172 2019/04/20 18:54:48 tom Exp $")

 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf
 
 #define DISCARD(string) string = ABSENT_STRING
 #define PRINTF (void) printf


@@ -1078,8 +1078,7 @@ fmt_entry(TERMTYPE2 *tterm,
                WRAP_CONCAT;
            } else if (TcOutput()) {
                char *srccap = _nc_tic_expand(capability, TRUE, numbers);
                WRAP_CONCAT;
            } else if (TcOutput()) {
                char *srccap = _nc_tic_expand(capability, TRUE, numbers);

-               int params = (((i < (int) SIZEOF(parametrized)) &&
-                              (i < STRCOUNT))
+               int params = ((i < (int) SIZEOF(parametrized))

                              ? parametrized[i]
                              : ((*srccap == 'k')
                                 ? 0
                              ? parametrized[i]
                              : ((*srccap == 'k')
                                 ? 0

diff --git a/progs/tic.c b/progs/tic.c
index 65b5fb75aea8d338dda6e2f1817b4a58d289311b..33d1311eb9caf578ce07711e41c6fbf71d01bf01 100644 (file)
--- a/progs/tic.c
+++ b/progs/tic.c
@@ -48,7 +48,7 @@
 #include <parametrized.h>
 #include <transform.h>
 
 #include <parametrized.h>
 #include <transform.h>
 

-MODULE_ID("$Id: tic.c,v 1.272 2019/04/06 20:18:54 tom Exp $")
+MODULE_ID("$Id: tic.c,v 1.274 2019/04/20 20:28:19 tom Exp $")

 
 #define STDIN_NAME "<stdin>"
 
 
 #define STDIN_NAME "<stdin>"
 


@@ -1937,6 +1937,8 @@ check_params(TERMTYPE2 *tp, const char *name, char *value, int extended)
        }
        expected = actual;
     }
        }
        expected = actual;
     }

+#else
+    (void) extended;

 #endif
 
     if (params[0]) {
 #endif
 
     if (params[0]) {


@@ -2316,8 +2318,7 @@ static void
 check_infotocap(TERMTYPE2 *tp, int i, const char *value)
 {
     const char *name = ExtStrname(tp, i, strnames);
 check_infotocap(TERMTYPE2 *tp, int i, const char *value)
 {
     const char *name = ExtStrname(tp, i, strnames);

-    int params = (((i < (int) SIZEOF(parametrized)) &&
-                  (i < STRCOUNT))
+    int params = ((i < (int) SIZEOF(parametrized))

                  ? parametrized[i]
                  : ((*value == 'k')
                     ? 0
                  ? parametrized[i]
                  : ((*value == 'k')
                     ? 0


@@ -2327,6 +2328,7 @@ check_infotocap(TERMTYPE2 *tp, int i, const char *value)
     char *tc_value;
     bool embedded;
 
     char *tc_value;
     bool embedded;
 

+    assert(SIZEOF(parametrized) == STRCOUNT);

     if ((ti_value = _nc_tic_expand(value, TRUE, to_char)) == ABSENT_STRING) {
        _nc_warning("tic-expansion of %s failed", name);
     } else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) {
     if ((ti_value = _nc_tic_expand(value, TRUE, to_char)) == ABSENT_STRING) {
        _nc_warning("tic-expansion of %s failed", name);
     } else if ((tc_value = _nc_infotocap(name, ti_value, params)) == ABSENT_STRING) {

diff --git a/test/knight.c b/test/knight.c
index 0d6675e5ba1689ad22ee843b7bbb2d8fec11c1a1..50cba37f8682e3f6a60d7ed2ea49f6dc18d2cdb0 100644 (file)
--- a/test/knight.c
+++ b/test/knight.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2018,2019 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -33,7 +33,7 @@
  * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995.  Mouse support
  * added September 20th 1995.
  *
  * Eric S. Raymond <esr@snark.thyrsus.com> July 22 1995.  Mouse support
  * added September 20th 1995.
  *

- * $Id: knight.c,v 1.44 2018/05/12 13:23:24 tom Exp $
+ * $Id: knight.c,v 1.45 2019/04/20 20:34:55 tom Exp $

  */
 
 #include <test.priv.h>
  */
 
 #include <test.priv.h>


@@ -75,7 +75,9 @@ static WINDOW *boardwin;      /* the board window */
 static WINDOW *helpwin;                /* the help window */
 static WINDOW *msgwin;         /* the message window */
 
 static WINDOW *helpwin;                /* the help window */
 static WINDOW *msgwin;         /* the message window */
 

+#if HAVE_USE_DEFAULT_COLORS

 static bool d_option;
 static bool d_option;

+#endif

 
 static chtype minus = '-';     /* possible-move character */
 static chtype oldch;
 
 static chtype minus = '-';     /* possible-move character */
 static chtype oldch;

diff --git a/test/ncurses.c b/test/ncurses.c
index c5188e51539f41655fb977da799e29d3dba63c05..9088f96f095f9e4e4d22f258d3b71f8fb9f28b22 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -40,7 +40,7 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 

-$Id: ncurses.c,v 1.514 2019/01/21 20:15:28 tom Exp $
+$Id: ncurses.c,v 1.515 2019/04/20 20:34:11 tom Exp $

 
 ***************************************************************************/
 
 
 ***************************************************************************/
 


@@ -7876,7 +7876,7 @@ main(int argc, char *argv[])
 {
     int c;
     int my_e_param = 1;
 {
     int c;
     int my_e_param = 1;

-#ifdef NCURSES_VERSION
+#if HAVE_USE_DEFAULT_COLORS

     int default_fg = COLOR_WHITE;
     int default_bg = COLOR_BLACK;
     bool assumed_colors = FALSE;
     int default_fg = COLOR_WHITE;
     int default_bg = COLOR_BLACK;
     bool assumed_colors = FALSE;


@@ -7892,7 +7892,7 @@ main(int argc, char *argv[])
 
     while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) {
        switch (c) {
 
     while ((c = getopt(argc, argv, "a:dEe:fhmp:s:Tt:x")) != -1) {
        switch (c) {

-#ifdef NCURSES_VERSION
+#if HAVE_USE_DEFAULT_COLORS

        case 'a':
            assumed_colors = TRUE;
            switch (sscanf(optarg, "%d,%d", &default_fg, &default_bg)) {
        case 'a':
            assumed_colors = TRUE;
            switch (sscanf(optarg, "%d,%d", &default_fg, &default_bg)) {

diff --git a/test/picsmap.c b/test/picsmap.c
index 6ca7c6d416be92e7041b2fa175d9cfd8883fb778..dd33d78c0ceac67d2377f91ea1cc3aa3c322c75f 100644 (file)
--- a/test/picsmap.c
+++ b/test/picsmap.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
  * authorization.                                                           *
  ****************************************************************************/
 /*

- * $Id: picsmap.c,v 1.128 2019/02/02 20:03:13 tom Exp $
+ * $Id: picsmap.c,v 1.129 2019/04/20 20:33:51 tom Exp $

  *
  * Author: Thomas E. Dickey
  *
  *
  * Author: Thomas E. Dickey
  *


@@ -1449,6 +1449,7 @@ dump_picture(PICS_HEAD * pics)
 static void
 init_display(const char *palette_path, int opt_d)
 {
 static void
 init_display(const char *palette_path, int opt_d)
 {

+    (void) opt_d;

     if (isatty(fileno(stdout))) {
        in_curses = TRUE;
        initscr();
     if (isatty(fileno(stdout))) {
        in_curses = TRUE;
        initscr();

diff --git a/test/test.priv.h b/test/test.priv.h
index 5f6f341c1764e847c705256f0aa9115f86172598..b9c5dc651b0905cab2d8c8b48cc3ae0b4af70723 100644 (file)
--- a/test/test.priv.h
+++ b/test/test.priv.h
@@ -29,7 +29,7 @@
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/
 /****************************************************************************
  *  Author: Thomas E. Dickey                    1996-on                     *
  ****************************************************************************/

-/* $Id: test.priv.h,v 1.181 2019/04/13 22:54:18 tom Exp $ */
+/* $Id: test.priv.h,v 1.182 2019/04/20 20:15:39 tom Exp $ */

 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1
 
 #ifndef __TEST_PRIV_H
 #define __TEST_PRIV_H 1


@@ -733,12 +733,37 @@ extern "C" {
 #define _nc_SLIMIT(n)          /* nothing */
 #endif
 
 #define _nc_SLIMIT(n)          /* nothing */
 #endif
 

+/*
+ * X/Open Curses does not define the arrays of terminfo/termcap names as SVr4
+ * curses did, and some implementations provide them anyway, but undeclared.
+ */

 #ifdef DECL_CURSES_DATA_BOOLNAMES
 extern char *boolnames[], *boolcodes[], *boolfnames[];
 extern char *numnames[], *numcodes[], *numfnames[];
 extern char *strnames[], *strcodes[], *strfnames[];
 #endif
 
 #ifdef DECL_CURSES_DATA_BOOLNAMES
 extern char *boolnames[], *boolcodes[], *boolfnames[];
 extern char *numnames[], *numcodes[], *numfnames[];
 extern char *strnames[], *strcodes[], *strfnames[];
 #endif
 

+/*
+ * Again, an SVr4 curses feature latent in the libraries but not in headers.
+ */
+#ifndef DECL_CURSES_DATA_TABSIZE
+#define DECL_CURSES_DATA_TABSIZE 0
+#endif
+
+#if DECL_CURSES_DATA_TABSIZE
+extern int TABSIZE;
+#undef  HAVE_CURSES_DATA_TABSIZE
+#define HAVE_CURSES_DATA_TABSIZE 1
+#endif
+
+#ifndef HAVE_CURSES_DATA_TABSIZE
+#define HAVE_CURSES_DATA_TABSIZE 0
+#endif
+
+/*
+ * X/Open Curses provides termname(), whose return value is analogous to the
+ * SVr4 curses variable ttytype[].
+ */

 #ifndef HAVE_CURSES_DATA_TTYTYPE
 #define HAVE_CURSES_DATA_TTYTYPE 0
 #endif
 #ifndef HAVE_CURSES_DATA_TTYTYPE
 #define HAVE_CURSES_DATA_TTYTYPE 0
 #endif