ncurses 6.2 - patch 20210313

+ improve configure CF_LD_SEARCHPATH macro used for ncurses*-config and
  ".pc" files, from dialog changes.
+ reduce dependency of math-library in test programs.
+ minor fixes for test_tparm.c (cf: 20210306)
+ mention "ncurses" prefix in curses_version() manpage (report by
  Michal Bielinski).
+ improved test/test_tparm.c, by limiting the tests to capabilities
This commit is contained in:
Thomas E. Dickey 2021-03-14 00:59:53 +00:00
parent 21b36e89c0
commit bec710451b
16 changed files with 135 additions and 67 deletions

14
NEWS
View File

@ -26,7 +26,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
-- $Id: NEWS,v 1.3638 2021/03/06 22:42:18 tom Exp $
-- $Id: NEWS,v 1.3641 2021/03/13 20:51:42 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@ -46,8 +46,16 @@ 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.
20210313
+ improve configure CF_LD_SEARCHPATH macro used for ncurses*-config and
".pc" files, from dialog changes.
+ reduce dependency of math-library in test programs.
+ minor fixes for test_tparm.c (cf: 20210306)
+ mention "ncurses" prefix in curses_version() manpage (report by
Michal Bielinski).
20210306
+ improved test/test_parm.c, by limiting the tests to capabilities
+ improved test/test_tparm.c, by limiting the tests to capabilities
that might have parameters or padding, and combined with tputs test.
+ improve discussion of padding versus tparm and tputs in
man/curs_terminfo.3x
@ -392,7 +400,7 @@ it is not possible to add this information.
+ re-enable "bel" in konsole-base (report by Nia Huang)
+ add linux-s entry (patch by Alexandre Montaron).
+ drop long-obsolete convert_configure.pl
+ add test/test_parm.c, for checking tparm changes.
+ add test/test_tparm.c, for checking tparm changes.
+ improve parameter-checking for tparm, adding function _nc_tiparm() to
handle the most-used case, which accepts only numeric parameters
(report/testcase by "puppet-meteor").

View File

@ -1 +1 @@
5:0:10 6.2 20210306
5:0:10 6.2 20210313

44
aclocal.m4 vendored
View File

@ -29,7 +29,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
dnl $Id: aclocal.m4,v 1.950 2021/01/26 23:45:12 tom Exp $
dnl $Id: aclocal.m4,v 1.951 2021/03/06 00:13:35 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@ -4090,7 +4090,7 @@ then
fi
])dnl
dnl ---------------------------------------------------------------------------
dnl CF_LD_SEARCHPATH version: 2 updated: 2019/09/26 20:34:14
dnl CF_LD_SEARCHPATH version: 3 updated: 2021/03/05 19:13:35
dnl ----------------
dnl Try to obtain the linker's search-path, for use in scripts.
dnl
@ -4106,14 +4106,14 @@ cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[[
# The -NX options tell newer versions of Linux ldconfig to not attempt to
# update the cache, which makes it run faster.
test -z "$cf_pathlist" && \
cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[[ ]]/d' -e 's/:$//' | sort -u`
cf_pathlist=`(ldconfig -NX -v) 2>/dev/null | sed -e '/^[[ ]]/d' -e 's/:$//' | sort -u`
test -z "$cf_pathlist" &&
cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[[ ]]/d' -e 's/:$//p' | sort -u`
cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e '/^[[ ]]/d' -e 's/:$//p' | sort -u`
# This works with OpenBSD 6.5, which lists only filenames
test -z "$cf_pathlist" &&
cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*[$],\1,p' | sort -u`
cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*[$],\1,p' | sort -u`
if test -z "$cf_pathlist"
then
@ -4128,13 +4128,37 @@ fi
if test -z "$cf_pathlist"
then
# Solaris is hardcoded
if test -d /opt/SUNWspro/lib
# Solaris is "SunOS"
if test -f /usr/bin/isainfo && test "x`uname -s`" = xSunOS
then
cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
elif test -d /usr/ccs/lib
case x`(isainfo -b)` in
(x64)
cf_pathlist="$cf_pathlist /lib/64 /usr/lib/64"
;;
(x32)
test -d /usr/ccs/lib && cf_pathlist="$cf_pathlist /usr/ccs/lib"
cf_pathlist="$cf_pathlist /lib /usr/lib"
;;
(*)
AC_MSG_WARN(problem with Solaris architecture)
;;
esac
fi
fi
if test -z "$cf_pathlist"
then
# HP-UX
if test x"`uname -s`" = xHP-UX
then
cf_pathlist="/usr/ccs/lib /usr/lib"
case x`getconf LONG_BIT` in
(x64)
cf_pathlist="/usr/lib/hpux64"
;;
(x*)
cf_pathlist="/usr/lib/hpux32"
;;
esac
fi
fi

75
configure vendored
View File

@ -28126,14 +28126,14 @@ cf_pathlist=`ld --verbose 2>/dev/null | grep SEARCH_DIR | sed -e 's,SEARCH_DIR[(
# The -NX options tell newer versions of Linux ldconfig to not attempt to
# update the cache, which makes it run faster.
test -z "$cf_pathlist" && \
cf_pathlist=`ldconfig -NX -v 2>/dev/null | sed -e '/^[ ]/d' -e 's/:$//' | sort -u`
cf_pathlist=`(ldconfig -NX -v) 2>/dev/null | sed -e '/^[ ]/d' -e 's/:$//' | sort -u`
test -z "$cf_pathlist" &&
cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e '/^[ ]/d' -e 's/:$//p' | sort -u`
cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e '/^[ ]/d' -e 's/:$//p' | sort -u`
# This works with OpenBSD 6.5, which lists only filenames
test -z "$cf_pathlist" &&
cf_pathlist=`ldconfig -v 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u`
cf_pathlist=`(ldconfig -v) 2>/dev/null | sed -n -e 's,^Adding \(.*\)/.*$,\1,p' | sort -u`
if test -z "$cf_pathlist"
then
@ -28148,13 +28148,38 @@ fi
if test -z "$cf_pathlist"
then
# Solaris is hardcoded
if test -d /opt/SUNWspro/lib
# Solaris is "SunOS"
if test -f /usr/bin/isainfo && test "x`uname -s`" = xSunOS
then
cf_pathlist="/opt/SUNWspro/lib /usr/ccs/lib /usr/lib"
elif test -d /usr/ccs/lib
case x`(isainfo -b)` in
(x64)
cf_pathlist="$cf_pathlist /lib/64 /usr/lib/64"
;;
(x32)
test -d /usr/ccs/lib && cf_pathlist="$cf_pathlist /usr/ccs/lib"
cf_pathlist="$cf_pathlist /lib /usr/lib"
;;
(*)
{ echo "$as_me:28163: WARNING: problem with Solaris architecture" >&5
echo "$as_me: WARNING: problem with Solaris architecture" >&2;}
;;
esac
fi
fi
if test -z "$cf_pathlist"
then
# HP-UX
if test x"`uname -s`" = xHP-UX
then
cf_pathlist="/usr/ccs/lib /usr/lib"
case x`getconf LONG_BIT` in
(x64)
cf_pathlist="/usr/lib/hpux64"
;;
(x*)
cf_pathlist="/usr/lib/hpux32"
;;
esac
fi
fi
@ -28176,7 +28201,7 @@ done
test -z "$cf_cv_ld_searchpath" && cf_cv_ld_searchpath=/usr/lib
fi
echo "$as_me:28179: result: $cf_cv_ld_searchpath" >&5
echo "$as_me:28204: result: $cf_cv_ld_searchpath" >&5
echo "${ECHO_T}$cf_cv_ld_searchpath" >&6
LD_SEARCHPATH=`echo "$cf_cv_ld_searchpath"|sed -e 's/ /|/g'`
@ -28266,7 +28291,7 @@ DEFS=-DHAVE_CONFIG_H
: "${CONFIG_STATUS=./config.status}"
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
{ echo "$as_me:28269: creating $CONFIG_STATUS" >&5
{ echo "$as_me:28294: creating $CONFIG_STATUS" >&5
echo "$as_me: creating $CONFIG_STATUS" >&6;}
cat >"$CONFIG_STATUS" <<_ACEOF
#! $SHELL
@ -28445,7 +28470,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
echo "$ac_cs_version"; exit 0 ;;
--he | --h)
# Conflict between --help and --header
{ { echo "$as_me:28448: error: ambiguous option: $1
{ { echo "$as_me:28473: error: ambiguous option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: ambiguous option: $1
Try \`$0 --help' for more information." >&2;}
@ -28464,7 +28489,7 @@ Try \`$0 --help' for more information." >&2;}
ac_need_defaults=false;;
# This is an error.
-*) { { echo "$as_me:28467: error: unrecognized option: $1
-*) { { echo "$as_me:28492: error: unrecognized option: $1
Try \`$0 --help' for more information." >&5
echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2;}
@ -28589,7 +28614,7 @@ do
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
"include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
*) { { echo "$as_me:28592: error: invalid argument: $ac_config_target" >&5
*) { { echo "$as_me:28617: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
@ -29097,7 +29122,7 @@ done; }
esac
if test x"$ac_file" != x-; then
{ echo "$as_me:29100: creating $ac_file" >&5
{ echo "$as_me:29125: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
rm -f "$ac_file"
fi
@ -29115,7 +29140,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:29118: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:29143: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -29128,7 +29153,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo "$srcdir/$f"
else
# /dev/null tree
{ { echo "$as_me:29131: error: cannot find input file: $f" >&5
{ { echo "$as_me:29156: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -29144,7 +29169,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
if test -n "$ac_seen"; then
ac_used=`grep '@datarootdir@' "$ac_item"`
if test -z "$ac_used"; then
{ echo "$as_me:29147: WARNING: datarootdir was used implicitly but not set:
{ echo "$as_me:29172: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used implicitly but not set:
$ac_seen" >&2;}
@ -29153,7 +29178,7 @@ $ac_seen" >&2;}
fi
ac_seen=`grep '${datarootdir}' "$ac_item"`
if test -n "$ac_seen"; then
{ echo "$as_me:29156: WARNING: datarootdir was used explicitly but not set:
{ echo "$as_me:29181: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&5
echo "$as_me: WARNING: datarootdir was used explicitly but not set:
$ac_seen" >&2;}
@ -29190,7 +29215,7 @@ s,@INSTALL@,$ac_INSTALL,;t t
ac_init=`${EGREP-egrep} '[ ]*'$ac_name'[ ]*=' "$ac_file"`
if test -z "$ac_init"; then
ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'`
{ echo "$as_me:29193: WARNING: Variable $ac_name is used but was not set:
{ echo "$as_me:29218: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&5
echo "$as_me: WARNING: Variable $ac_name is used but was not set:
$ac_seen" >&2;}
@ -29201,7 +29226,7 @@ $ac_seen" >&2;}
${EGREP-egrep} -n '@[A-Z_][A-Z_0-9]+@' "$ac_file" >>$tmp/out
if test -s $tmp/out; then
ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out`
{ echo "$as_me:29204: WARNING: Some variables may not be substituted:
{ echo "$as_me:29229: WARNING: Some variables may not be substituted:
$ac_seen" >&5
echo "$as_me: WARNING: Some variables may not be substituted:
$ac_seen" >&2;}
@ -29250,7 +29275,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
* ) ac_file_in=$ac_file.in ;;
esac
test x"$ac_file" != x- && { echo "$as_me:29253: creating $ac_file" >&5
test x"$ac_file" != x- && { echo "$as_me:29278: creating $ac_file" >&5
echo "$as_me: creating $ac_file" >&6;}
# First look for the input files in the build tree, otherwise in the
@ -29261,7 +29286,7 @@ echo "$as_me: creating $ac_file" >&6;}
-) echo $tmp/stdin ;;
[\\/$]*)
# Absolute (can't be DOS-style, as IFS=:)
test -f "$f" || { { echo "$as_me:29264: error: cannot find input file: $f" >&5
test -f "$f" || { { echo "$as_me:29289: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
echo $f;;
@ -29274,7 +29299,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
echo "$srcdir/$f"
else
# /dev/null tree
{ { echo "$as_me:29277: error: cannot find input file: $f" >&5
{ { echo "$as_me:29302: error: cannot find input file: $f" >&5
echo "$as_me: error: cannot find input file: $f" >&2;}
{ (exit 1); exit 1; }; }
fi;;
@ -29332,7 +29357,7 @@ cat >>"$CONFIG_STATUS" <<\EOF
rm -f $tmp/in
if test x"$ac_file" != x-; then
if cmp -s "$ac_file" "$tmp/config.h" 2>/dev/null; then
{ echo "$as_me:29335: $ac_file is unchanged" >&5
{ echo "$as_me:29360: $ac_file is unchanged" >&5
echo "$as_me: $ac_file is unchanged" >&6;}
else
ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@ -29719,7 +29744,7 @@ cf_ITEM=`echo "$cf_item" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQ
(cygdll|msysdll|mingw|msvcdll)
test "x$with_shared_cxx" = xno && test -n "$verbose" && echo " overriding CXX_MODEL to SHARED" 1>&6
echo "${as_me:-configure}:29722: testing overriding CXX_MODEL to SHARED ..." 1>&5
echo "${as_me:-configure}:29747: testing overriding CXX_MODEL to SHARED ..." 1>&5
with_shared_cxx=yes
;;

View File

@ -26,7 +26,7 @@
# use or other dealings in this Software without prior written #
# authorization. #
##############################################################################
# $Id: dist.mk,v 1.1403 2021/03/06 12:54:29 tom Exp $
# $Id: dist.mk,v 1.1404 2021/03/13 09:33:57 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 = 20210306
NCURSES_PATCH = 20210313
# We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

View File

@ -29,8 +29,12 @@
.\"
.\" Author: Thomas E. Dickey 1999-on
.\"
.\" $Id: curs_extend.3x,v 1.24 2020/10/24 09:37:07 tom Exp $
.\" $Id: curs_extend.3x,v 1.25 2021/03/13 13:43:05 tom Exp $
.TH curs_extend 3X ""
.ie \n(.g .ds `` \(lq
.el .ds `` ``
.ie \n(.g .ds '' \(rq
.el .ds '' ''
.SH NAME
\fBcurses_version\fP,
\fBuse_extended_names\fP \- miscellaneous curses extensions
@ -47,8 +51,12 @@ which do not fit easily into other categories.
.SS curses_version
.PP
Use \fBcurses_version\fP
to get the version number, including patch level of the library, e.g.,
.B 5.0.19991023
to get the version number, including patch level of the library,
prefixed by \*(``ncurses\*('', e.g.,
.RS
.sp
.B ncurses 5.0.19991023
.RE
.SS use_extended_names
.PP
The \fBuse_extended_names\fP

View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20210306) unstable; urgency=low
ncurses6 (6.2+20210313) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Mar 2021 07:54:29 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Mar 2021 04:33:57 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20210306) unstable; urgency=low
ncurses6 (6.2+20210313) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Mar 2021 07:54:29 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Mar 2021 04:33:57 -0500
ncurses6 (5.9-20131005) unstable; urgency=low

View File

@ -1,8 +1,8 @@
ncurses6 (6.2+20210306) unstable; urgency=low
ncurses6 (6.2+20210313) unstable; urgency=low
* latest weekly patch
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 06 Mar 2021 07:54:29 -0500
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 13 Mar 2021 04:33:57 -0500
ncurses6 (5.9-20120608) unstable; urgency=low

View File

@ -1,4 +1,4 @@
; $Id: mingw-ncurses.nsi,v 1.446 2021/03/06 12:54:29 tom Exp $
; $Id: mingw-ncurses.nsi,v 1.447 2021/03/13 09:33:57 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 "2021"
!define VERSION_MMDD "0306"
!define VERSION_MMDD "0313"
!define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}
!define MY_ABI "5"

View File

@ -3,7 +3,7 @@
Summary: shared libraries for terminal handling
Name: mingw32-ncurses6
Version: 6.2
Release: 20210306
Release: 20210313
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,7 +1,7 @@
Summary: shared libraries for terminal handling
Name: ncurses6
Version: 6.2
Release: 20210306
Release: 20210313
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,7 +1,7 @@
Summary: Curses library with POSIX thread support.
Name: ncursest6
Version: 6.2
Release: 20210306
Release: 20210313
License: X11
Group: Development/Libraries
Source: ncurses-%{version}-%{release}.tgz

View File

@ -1,6 +1,6 @@
# $Id: Makefile.in,v 1.125 2020/07/18 18:47:54 tom Exp $
# $Id: Makefile.in,v 1.126 2021/03/13 20:55:43 tom Exp $
##############################################################################
# Copyright 2020 Thomas E. Dickey #
# Copyright 2020,2021 Thomas E. Dickey #
# Copyright 1998-2017,2018 Free Software Foundation, Inc. #
# #
# Permission is hereby granted, free of charge, to any person obtaining a #
@ -118,19 +118,22 @@ LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
# use these for linking with all of the libraries
LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS)
LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_DEFAULT)
# use these for linking with the (n)curses library and possibly pthreads
LIBS_THREADS = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB) @PTHREAD@
LIBS_THREADS = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) @PTHREAD@
LDFLAGS_THREADS = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_THREADS)
# use these for linking with the (n)curses library
LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS) $(MATH_LIB)
LIBS_CURSES = `echo "$(TEST_ARGS) @LIBS@" | sed -e 's/-l@FORM_NAME@.*-l@PANEL_NAME@[^ ]*//'` $(TEST_LIBS)
LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
# use these when we need the math library
LDFLAGS_CURSES_M= $(LDFLAGS_CURSES) $(MATH_LIB)
# use these for linking with the tinfo library if we have it, or curses library if not
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS)
LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
LINT = @LINT@

View File

@ -1,4 +1,4 @@
# $Id: programs,v 1.48 2021/02/13 16:33:51 tom Exp $
# $Id: programs,v 1.49 2021/03/13 20:37:44 tom Exp $
##############################################################################
# Copyright 2018-2020,2021 Thomas E. Dickey #
# Copyright 2006-2016,2017 Free Software Foundation, Inc. #
@ -65,7 +65,7 @@ firstlast $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) firstlast
foldkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) foldkeys
form_driver_w $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) form_driver_w popup_msg
gdc $(LDFLAGS_CURSES) $(LOCAL_LIBS) gdc
hanoi $(LDFLAGS_CURSES) $(LOCAL_LIBS) hanoi
hanoi $(LDFLAGS_CURSES_M) $(LOCAL_LIBS) hanoi
hashtest $(LDFLAGS_CURSES) $(LOCAL_LIBS) hashtest
inch_wide $(LDFLAGS_CURSES) $(LOCAL_LIBS) inch_wide popup_msg
inchs $(LDFLAGS_CURSES) $(LOCAL_LIBS) inchs popup_msg
@ -89,7 +89,7 @@ rain $(LDFLAGS_THREADS) $(LOCAL_LIBS) rain popup_msg
redraw $(LDFLAGS_CURSES) $(LOCAL_LIBS) redraw popup_msg
savescreen $(LDFLAGS_CURSES) $(LOCAL_LIBS) savescreen popup_msg
sp_tinfo $(LDFLAGS_TINFO) $(LOCAL_LIBS) sp_tinfo
tclock $(LDFLAGS_CURSES) $(LOCAL_LIBS) tclock
tclock $(LDFLAGS_CURSES_M) $(LOCAL_LIBS) tclock
test_add_wchstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_add_wchstr
test_addchstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addchstr
test_addstr $(LDFLAGS_CURSES) $(LOCAL_LIBS) test_addstr

View File

@ -29,7 +29,7 @@
/*
* Author: Thomas E. Dickey
*
* $Id: test_tparm.c,v 1.17 2021/03/06 23:39:14 tom Exp $
* $Id: test_tparm.c,v 1.19 2021/03/13 17:18:28 tom Exp $
*
* Exercise tparm, either for all possible capabilities with fixed parameters,
* or one capability with all possible parameters.
@ -393,7 +393,7 @@ main(int argc, char *argv[])
r_opt = 1;
if (a_opt) {
for (n = 0; n < use_parms; ++n)
for (n = 0; n < max_parms; ++n)
if (num_parms[n])
use_parms *= (num_parms[n] + 1);
}
@ -429,9 +429,9 @@ main(int argc, char *argv[])
all_terms[t_run]);
}
memset(all_parms, 0, sizeof(all_parms));
if (a_opt) {
/* for each combination of values */
memset(all_parms, 0, sizeof(all_parms));
do {
for (n_run = 0; n_run < use_caps; ++n_run) {
test_tparm(cap_name[n_run], cap_data[n_run], all_parms);