Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2020-02-21 16:39:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses" Fri Feb 21 16:39:59 2020 rev:166 rq:774813 version:6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2020-01-30 09:41:45.109501376 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new.26092/ncurses.changes 2020-02-21 16:40:31.305812909 +0100 @@ -1,0 +2,62 @@ +Mon Feb 17 08:37:54 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Add ncurses patch 20200215 + + improve manual page for panel library, extending the portability + section as well as documenting error-returns. + + show tic's version when installing terminal database in run_tic.sh + + correct check for gcc vs other compilers used in ncurses 6.0, from + FreeBSD patch by Kyle Evans (cf: 20150725). + + add notes for 6.2 to INSTALL. + +------------------------------------------------------------------- +Wed Feb 12 10:55:11 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Update to ncurses 6.2 (patch 20200212) + * Add 20200212 6.2 release for upload to ftp.gnu.org + + update release notes + + minor build-fixes, mostly to test-package scripts + * Add ncurses patch20200208 + + modify check for sizeof(wchar_t) to ensure it gives useful result + when cross-compiling. + + drop assumption in configure script that Cygwin's linker is broken. + + define NCURSES_BROKEN_LINKER if the broken-linker feature is used, + to simplify configure-checks for ncurses-examples. + * Add ncurses patch20200202 + + reassert copyright on ncurses, per discussion in ncurses FAQ: + https://invisible-island.net/ncurses/ncurses.faq.html#relicensed + * Add ncurses patch20200201 + + modify comparison in make_hash.c to correct a special case in + collision handling for Caps-hpux11 + + add testing utility report_hashing to check hash-tables used for + terminfo and termcap names. + + fix a missing prototype for _nc_free_and_exit(). + + update a few comments about tack 1.07 + + use an awk script to split too-long pathnames used in Ada95 sample + programs for explain.txt +- Update to tack 1.9 (patch 20200202) + * Update copyright and license. Also, portability fixes. +- Adopt patch ncurses-5.7-tack.dif +- Adopt patch ncurses-6.1.dif which is now ncurses-6.2.dif + +------------------------------------------------------------------- +Mon Jan 20 07:14:28 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Add ncurses patch 20200118 + + expanded description of XM in user_caps.5 + + improve xm example for xterm+x11mouse, xterm+sm+1006 -TD + + add history section to curs_slk.3x and curs_terminfo.3x manpages. + + update alacritty entries for 0.4.0 (prompted by patch by + Christian Durr) -TD + + correct spelling errors found with codespell. + + fix for test/configure, from xterm #352. + +------------------------------------------------------------------- +Mon Jan 13 09:14:28 UTC 2020 - Dr. Werner Fink <[email protected]> + +- Add ncurses patch 20200111 + + improve configure macros which check for the X11/Intrinsic.h header, + to accommodate recent MacOS changes. + + suppress gcc's -Winline warning; it has not been useful for some time + + update config.guess, config.sub + +------------------------------------------------------------------- Old: ---- ncurses-6.1-patches.tar.bz2 ncurses-6.1.dif ncurses-6.1.tar.gz tack-1.08-20190721.tgz New: ---- ncurses-6.2-patches.tar.bz2 ncurses-6.2.dif ncurses-6.2.tar.gz tack-1.09-20200202.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.ApxBZM/_old 2020-02-21 16:40:34.341818976 +0100 +++ /var/tmp/diff_new_pack.ApxBZM/_new 2020-02-21 16:40:34.345818983 +0100 @@ -56,23 +56,23 @@ # but also build the ABI version 5 as this is part of the source # tar ball including the latest upstream fixes for ABI 5. # -Version: 6.1 +Version: 6.2 Release: 0 Summary: Terminal control library #Git: http://ncurses.scripts.mit.edu License: MIT Group: System/Base URL: http://www.invisible-island.net/ncurses/ncurses.html -Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.1.tar.gz -Source1: ncurses-6.1-patches.tar.bz2 +Source0: ftp://ftp.invisible-island.net/ncurses/ncurses-6.2.tar.gz +Source1: ncurses-6.2-patches.tar.bz2 Source2: handle.linux Source3: README.devel Source4: ncurses-rpmlintrc # Latest tack can be found at ftp://ftp.invisible-island.net/pub/ncurses/current/ -Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.08-20190721.tgz +Source5: ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20200202.tgz Source6: edit.sed Source7: baselibs.conf -Patch0: ncurses-6.1.dif +Patch0: ncurses-6.2.dif Patch1: ncurses-5.9-ibm327x.dif Patch2: ncurses-5.7-tack.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -1044,7 +1044,13 @@ sed "s@^%{buildroot}@@g" | \ grep -v -F -x -f default.list -f screen.list -f iterm.list \ > extension.list +# +# Remove backward compatibilty link if any +# rm -f %{buildroot}%{_prefix}/lib/terminfo +# +# Store pkg-config files +# cp -p pc/*.pc %{buildroot}%{_libdir}/pkgconfig/ %if 0%{?qemu_user_space_build:1}%{?_crossbuild} ++++++ ncurses-5.7-tack.dif ++++++ --- /var/tmp/diff_new_pack.ApxBZM/_old 2020-02-21 16:40:34.525819343 +0100 +++ /var/tmp/diff_new_pack.ApxBZM/_new 2020-02-21 16:40:34.529819351 +0100 @@ -3,8 +3,8 @@ 1 file changed, 5 insertions(+), 5 deletions(-) --- tack/Makefile.in -+++ tack/Makefile.in 2018-01-22 11:17:39.717358930 +0000 -@@ -84,7 +84,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) ++++ tack/Makefile.in 2020-02-12 11:04:53.991231022 +0000 +@@ -85,7 +85,7 @@ CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE CFLAGS_PROFILE = $(CCFLAGS) -pg @@ -13,7 +13,7 @@ CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) -@@ -93,7 +93,7 @@ ABI_VERSION = @cf_cv_abi_version@ +@@ -94,7 +94,7 @@ ABI_VERSION = @cf_cv_abi_version@ LOCAL_LIBDIR = @top_builddir@/lib LD = @LD@ @@ -22,7 +22,7 @@ LDFLAGS = @EXTRA_LDFLAGS@ @TINFO_LDFLAGS@ \ @LDFLAGS@ @LD_MODEL@ @TINFO_LIBS@ @LIBS@ -@@ -101,7 +101,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI +@@ -102,7 +102,7 @@ LDFLAGS_LIBTOOL = $(LDFLAGS) $(CFLAGS_LI LDFLAGS_NORMAL = $(LDFLAGS) $(CFLAGS_NORMAL) LDFLAGS_DEBUG = $(LDFLAGS) $(CFLAGS_DEBUG) LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE) @@ -31,7 +31,7 @@ LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) -@@ -165,10 +165,10 @@ DEPS_TACK = \ +@@ -166,10 +166,10 @@ DEPS_TACK = \ $(MODEL)/tack$o tack$x: $(DEPS_TACK) @NCURSES_TREE@$(DEPS_CURSES) ++++++ ncurses-5.9-ibm327x.dif ++++++ --- /var/tmp/diff_new_pack.ApxBZM/_old 2020-02-21 16:40:34.561819415 +0100 +++ /var/tmp/diff_new_pack.ApxBZM/_new 2020-02-21 16:40:34.561819415 +0100 @@ -4,7 +4,7 @@ --- misc/terminfo.src +++ misc/terminfo.src 2018-10-29 10:23:47.271511864 +0000 -@@ -17044,8 +17044,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv +@@ -17051,8 +17051,8 @@ hazel|exec80|h80|he80|Hazeltine Executiv # ibm327x|line mode IBM 3270 style, ++++++ ncurses-6.1-patches.tar.bz2 -> ncurses-6.2-patches.tar.bz2 ++++++ ++++ 501211 lines of diff (skipped) ++++++ ncurses-6.1.dif -> ncurses-6.2.dif ++++++ ++++ 619 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/ncurses/ncurses-6.1.dif ++++ and /work/SRC/openSUSE:Factory/.ncurses.new.26092/ncurses-6.2.dif ++++++ ncurses-6.1.tar.gz -> ncurses-6.2.tar.gz ++++++ ++++ 152495 lines of diff (skipped) ++++++ tack-1.08-20190721.tgz -> tack-1.09-20200202.tgz ++++++ ++++ 10822 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/CHANGES new/tack-1.09-20200202/CHANGES --- old/tack-1.08-20190721/CHANGES 2019-07-21 21:09:13.000000000 +0200 +++ new/tack-1.09-20200202/CHANGES 2020-02-02 18:00:47.000000000 +0100 @@ -1,3 +1,39 @@ +2020-02-02 Thomas E. Dickey <[email protected]> + + * tack.c: update copyright in version-message + + * package/tack.spec, tack.h, package/debian/changelog, HISTORY: + bump to 1.09 + + * fun.c, init.c, output.c, tack.h: + reduce some of the const/assignment and similar warnings seen in Unix builds + + * edit.c, scan.c, tack.h, output.c: cppcheck-warnings + + * package/debian/compat, package/debian/rules: fix build-warnings + + * package/debian/copyright: update copyright + + * Makefile.in, aclocal.m4, ansi.c, charset.c, color.c, configure.in, control.c, crum.c, edit.c, fun.c, init.c, menu.c, modes.c, modules, ncurses_tst.hin, output.c, pad.c, scan.c, sync.c, sysdep.c, tack.1, tack.c, tack.h, tackgen.c: + update copyright notices using script which inspects commit-timestamps + + * ansi.c, charset.c, color.c, control.c, crum.c, edit.c, fun.c, init.c, menu.c, modes.c, output.c, pad.c, scan.c, sync.c, sysdep.c, tack.c, tack.h, tackgen.c: + rescind permission implied or otherwise to relicense my work as GPL3 + + * aclocal.m4: resync with my-autoconf + + * configure: regen + + * package/debian/changelog, package/tack.spec, tack.h: bump + +2019-12-20 Thomas E. Dickey <[email protected]> + + * config.guess: 2019-12-21 + +2019-09-11 Thomas E. Dickey <[email protected]> + + * config.sub: 2019-09-11 + 2019-07-21 Thomas E. Dickey <[email protected]> * tack.c, edit.c, tack.h: gcc-8.x-warnings diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/HISTORY new/tack-1.09-20200202/HISTORY --- old/tack-1.08-20190721/HISTORY 2017-07-26 10:08:21.000000000 +0200 +++ new/tack-1.09-20200202/HISTORY 2020-02-02 17:33:29.000000000 +0100 @@ -1,6 +1,7 @@ Current history: +2020/02/02 1.09 Update copyright and license. Also, portability fixes. 2017/07/26 1.08 Reduce reliance on ncurses internals. 2009/12/26 1.07 Fix an allocation-size. 2007/08/11 1.06 Updates to build with ncurses 5.6 patch 20070811 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/ansi.c new/tack-1.09-20200202/ansi.c --- old/tack-1.08-20190721/ansi.c 2017-07-29 02:22:16.000000000 +0200 +++ new/tack-1.09-20200202/ansi.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: ansi.c,v 1.18 2017/07/29 00:22:16 tom Exp $") +MODULE_ID("$Id: ansi.c,v 1.20 2020/02/02 14:47:18 tom Exp $") /* * Standalone tests for ANSI terminals. Three entry points: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/charset.c new/tack-1.09-20200202/charset.c --- old/tack-1.08-20190721/charset.c 2019-07-21 20:14:30.000000000 +0200 +++ new/tack-1.09-20200202/charset.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. +** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: charset.c,v 1.26 2019/07/21 18:14:30 tom Exp $") +MODULE_ID("$Id: charset.c,v 1.28 2020/02/02 14:47:18 tom Exp $") /* Menu definitions for alternate character set and SGR tests. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/color.c new/tack-1.09-20200202/color.c --- old/tack-1.08-20190721/color.c 2017-07-29 02:11:21.000000000 +0200 +++ new/tack-1.09-20200202/color.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: color.c,v 1.15 2017/07/29 00:11:21 tom Exp $") +MODULE_ID("$Id: color.c,v 1.17 2020/02/02 14:47:18 tom Exp $") /* * Color terminal tests. Has only one entry point: test_color(). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/configure.in new/tack-1.09-20200202/configure.in --- old/tack-1.08-20190721/configure.in 2019-07-21 19:33:30.000000000 +0200 +++ new/tack-1.09-20200202/configure.in 2020-02-02 15:47:18.000000000 +0100 @@ -1,5 +1,6 @@ dnl*************************************************************************** -dnl Copyright (c) 2007-2017,2019 Free Software Foundation, Inc. * +dnl Copyright 2017-2019,2020 Thomas E. Dickey * +dnl Copyright 2007-2015,2017 Free Software Foundation, Inc. * dnl * dnl Permission is hereby granted, free of charge, to any person obtaining a * dnl copy of this software and associated documentation files (the * @@ -28,7 +29,7 @@ dnl dnl Author: Thomas E. Dickey 2007-on dnl -dnl $Id: configure.in,v 1.41 2019/07/21 17:33:30 tom Exp $ +dnl $Id: configure.in,v 1.42 2020/02/02 14:47:18 tom Exp $ dnl This is a simple configuration-script for tack which makes it simpler to dnl build outside the ncurses tree (provided that ncurses was configured using dnl the --with-ticlib option). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/control.c new/tack-1.09-20200202/control.c --- old/tack-1.08-20190721/control.c 2017-07-29 02:09:45.000000000 +0200 +++ new/tack-1.09-20200202/control.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2015,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2015,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,7 +25,7 @@ #include <sys/time.h> #endif -MODULE_ID("$Id: control.c,v 1.18 2017/07/29 00:09:45 tom Exp $") +MODULE_ID("$Id: control.c,v 1.20 2020/02/02 14:47:18 tom Exp $") /* terminfo test program control subroutines */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/crum.c new/tack-1.09-20200202/crum.c --- old/tack-1.08-20190721/crum.c 2017-07-29 02:07:37.000000000 +0200 +++ new/tack-1.09-20200202/crum.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2011,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2011,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: crum.c,v 1.12 2017/07/29 00:07:37 tom Exp $") +MODULE_ID("$Id: crum.c,v 1.14 2020/02/02 14:47:18 tom Exp $") /* * Test cursor movement. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/edit.c new/tack-1.09-20200202/edit.c --- old/tack-1.08-20190721/edit.c 2019-07-21 21:08:38.000000000 +0200 +++ new/tack-1.09-20200202/edit.c 2020-02-02 16:31:09.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1997-2017,2019 Free Software Foundation, Inc. +** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +24,7 @@ #include <tack.h> -MODULE_ID("$Id: edit.c,v 1.44 2019/07/21 19:08:38 tom Exp $") +MODULE_ID("$Id: edit.c,v 1.47 2020/02/02 15:31:09 tom Exp $") /* * These are adapted from tic.h @@ -317,11 +317,10 @@ int user_modified(void) { - const char *a, *b; - int i, v; + int i; for (i = 0; i < MAX_BOOLEAN; i++) { - v = (i == xon_index) ? xon_shadow : get_newer_boolean(i); + int v = (i == xon_index) ? xon_shadow : get_newer_boolean(i); if (get_saved_boolean(i) != v) { return TRUE; } @@ -332,6 +331,7 @@ } } for (i = 0; i < (int) MAX_STRINGS; i++) { + const char *a, *b; if ((a = get_saved_string(i)) == 0) a = ""; if ((b = get_newer_string(i)) == 0) @@ -798,7 +798,9 @@ return 0; } if (buffer == 0 || need > length) { + char *tofree = buffer; if ((buffer = (char *) realloc(buffer, length = need)) == 0) { + free(tofree); return 0; } } @@ -824,8 +826,7 @@ && isprint((int) value)) { ch = (int) value; buffer[bufp++] = S_QUOTE; - if (ch == '\\' - || ch == S_QUOTE) + if (ch == S_QUOTE) buffer[bufp++] = '\\'; buffer[bufp++] = (char) ch; buffer[bufp++] = S_QUOTE; @@ -1181,7 +1182,7 @@ { NAME_TABLE const *nt; char *s; - int n, op, b; + int n, op; char buf[TEMP_SIZE]; char tmp[TEMP_SIZE]; @@ -1195,7 +1196,10 @@ put_clear(); } op = t->flags & 255; + if ((nt = find_capability(buf)) != 0) { + int b; + switch (nt->nt_type) { case BOOLEAN: if (op == SHOW_DELETE) { @@ -1334,14 +1338,12 @@ int *state GCC_UNUSED, int *ch) { - int i, header = 1, v; - const char *a; - const char *b; + int i, header = 1; static char title[] = " old value cap new value"; char abuf[TEMP_SIZE]; for (i = 0; i < MAX_BOOLEAN; i++) { - v = (i == xon_index) ? xon_shadow : get_newer_boolean(i); + int v = (i == xon_index) ? xon_shadow : get_newer_boolean(i); if (get_saved_boolean(i) != v) { if (header) { ptextln(title); @@ -1365,6 +1367,8 @@ } } for (i = 0; i < (int) MAX_STRINGS; i++) { + const char *a; + const char *b; if ((a = get_saved_string(i)) == 0) a = ""; if ((b = get_newer_string(i)) == 0) @@ -1518,10 +1522,11 @@ build_change_menu( TestMenu * m) { - int i, j, k; + int i, j; char *s; for (i = j = 0; i < txp; i++) { + int k; if ((k = tx_index[i]) >= 0) { s = form_terminfo(tx_cap[i]); s[40] = '\0'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/fun.c new/tack-1.09-20200202/fun.c --- old/tack-1.08-20190721/fun.c 2017-07-29 02:02:52.000000000 +0200 +++ new/tack-1.09-20200202/fun.c 2020-02-02 17:31:05.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2013,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2013,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: fun.c,v 1.26 2017/07/29 00:02:52 tom Exp $") +MODULE_ID("$Id: fun.c,v 1.29 2020/02/02 16:31:05 tom Exp $") /* * Test the function keys on the terminal. The code for echo tests @@ -45,7 +45,6 @@ {MENU_LAST, 0, 0, 0, 0, 0, 0} }; /* *INDENT-ON* */ - static void printer_on(TestList *, int *, int *); static void printer_mc0(TestList *, int *, int *); @@ -851,14 +850,14 @@ if (hex_display) { ptext(hex_expand_to(&buf[i - 1], 3)); } else { - tc_putch(ch | high_bit); + tc_putch((TC_PUTCH) (ch | high_bit)); } } else if (ch == '\n' || ch == '\r') { /* status report test */ put_crlf(); crp = 0; } else if (crp++ < crx) { - tc_putch(ch | high_bit); + tc_putch((TC_PUTCH) (ch | high_bit)); } else { put_str(expand(&buf[i - 1])); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/init.c new/tack-1.09-20200202/init.c --- old/tack-1.08-20190721/init.c 2019-07-21 20:31:54.000000000 +0200 +++ new/tack-1.09-20200202/init.c 2020-02-02 17:31:05.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. +** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 1997-2013,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -26,7 +26,7 @@ #include <tack.h> -MODULE_ID("$Id: init.c,v 1.37 2019/07/21 18:31:54 tom Exp $") +MODULE_ID("$Id: init.c,v 1.40 2020/02/02 16:31:05 tom Exp $") FILE *debug_fp; char temp[TEMP_SIZE]; @@ -293,7 +293,7 @@ */ #if (defined(HAVE_CURSES_DATA_ACS_MAP) || defined(NEED_ACS_MAP)) && ! (defined(NUM_ACS) || defined(NCURSES_VERSION)) if (acs_map == 0) { - acs_map = calloc(256, sizeof(acs_map[0])); + acs_map = calloc((size_t) 256, sizeof(acs_map[0])); } #endif if (value != 0) { @@ -502,7 +502,7 @@ const char * safe_tgets(NCURSES_CONST char *name) { - char *value = tigetstr(name); + char *value = (char *) tigetstr(name); if (!VALID_STRING(value)) value = 0; return value; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/menu.c new/tack-1.09-20200202/menu.c --- old/tack-1.08-20190721/menu.c 2017-07-29 01:56:42.000000000 +0200 +++ new/tack-1.09-20200202/menu.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2010,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2010,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: menu.c,v 1.11 2017/07/28 23:56:42 tom Exp $") +MODULE_ID("$Id: menu.c,v 1.13 2020/02/02 14:47:18 tom Exp $") /* Menu control diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/modes.c new/tack-1.09-20200202/modes.c --- old/tack-1.08-20190721/modes.c 2017-08-17 11:22:51.000000000 +0200 +++ new/tack-1.09-20200202/modes.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2010,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2010,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: modes.c,v 1.12 2017/08/17 09:22:51 tom Exp $") +MODULE_ID("$Id: modes.c,v 1.14 2020/02/02 14:47:18 tom Exp $") /* * Tests boolean flags and terminal modes. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/modules new/tack-1.09-20200202/modules --- old/tack-1.08-20190721/modules 2017-07-26 03:36:10.000000000 +0200 +++ new/tack-1.09-20200202/modules 2020-02-02 15:47:18.000000000 +0100 @@ -1,6 +1,7 @@ -# $Id: modules,v 1.8 2017/07/26 01:36:10 tom Exp $ +# $Id: modules,v 1.9 2020/02/02 14:47:18 tom Exp $ ############################################################################## -# Copyright (c) 1998-2006,2017 Free Software Foundation, Inc. # +# Copyright 2020 Thomas E. Dickey # +# Copyright 1997-2006,2017 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 "Software"), # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/ncurses_tst.hin new/tack-1.09-20200202/ncurses_tst.hin --- old/tack-1.08-20190721/ncurses_tst.hin 2012-09-16 17:16:02.000000000 +0200 +++ new/tack-1.09-20200202/ncurses_tst.hin 2020-02-02 15:47:18.000000000 +0100 @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 1998 Free Software Foundation, Inc. * + * Copyright 2020 Thomas E. Dickey * + * Copyright 1998,2012 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 * @@ -30,7 +31,7 @@ * Author: Thomas E. Dickey <[email protected]> 1998 * ****************************************************************************/ /* - * $Id: ncurses_tst.hin,v 1.2 2012/09/16 15:16:02 Adrian.Bunk Exp $ + * $Id: ncurses_tst.hin,v 1.3 2020/02/02 14:47:18 tom Exp $ * * This is a template-file used to generate the "ncurses_cfg.h" file. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/output.c new/tack-1.09-20200202/output.c --- old/tack-1.08-20190721/output.c 2017-08-18 16:27:00.000000000 +0200 +++ new/tack-1.09-20200202/output.c 2020-02-02 17:31:05.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,7 +23,7 @@ #include <tack.h> #include <time.h> -MODULE_ID("$Id: output.c,v 1.26 2017/08/18 14:27:00 tom Exp $") +MODULE_ID("$Id: output.c,v 1.30 2020/02/02 16:31:05 tom Exp $") /* globals */ long char_sent; /* number of characters sent */ @@ -244,7 +244,7 @@ void put_this(int c) { /* output one character (with padding) */ - tc_putch(c); + tc_putch((TC_PUTCH) c); if (char_padding && replace_mode) tt_putp(char_padding); } @@ -433,25 +433,6 @@ } void -put_dec(char *f, int i) -{ /* print a line with a decimal number in it */ - char tm[128]; - - sprintf(tm, f, i / 10, i % 10); - ptext(tm); -} - -void -three_digit(char *tx, int i) -{ /* convert the decimal number to a string of - at least 3 digits */ - if (i < 1000) - sprintf(tx, "%d.%d", i / 10, i % 10); - else - sprintf(tx, "%d", i / 10); -} - -void ptextln(const char *s) { /* print the text using ptext() then add a CR LF */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/package/debian/changelog new/tack-1.09-20200202/package/debian/changelog --- old/tack-1.08-20190721/package/debian/changelog 2019-07-21 14:26:44.000000000 +0200 +++ new/tack-1.09-20200202/package/debian/changelog 2020-02-02 17:34:25.000000000 +0100 @@ -1,3 +1,9 @@ +tack (1.09+20200202) unstable; urgency=low + + * update copyright and license + + -- Thomas E. Dickey <[email protected]> Sun, 02 Feb 2020 08:51:23 -0500 + tack (1.08+20190721) unstable; urgency=low * maintenance updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/package/debian/compat new/tack-1.09-20200202/package/debian/compat --- old/tack-1.08-20190721/package/debian/compat 2010-04-20 21:47:10.000000000 +0200 +++ new/tack-1.09-20200202/package/debian/compat 2020-02-02 16:11:15.000000000 +0100 @@ -1 +1 @@ -5 +9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/package/debian/copyright new/tack-1.09-20200202/package/debian/copyright --- old/tack-1.08-20190721/package/debian/copyright 2017-07-23 23:22:04.000000000 +0200 +++ new/tack-1.09-20200202/package/debian/copyright 2020-02-02 15:52:27.000000000 +0100 @@ -2,12 +2,12 @@ Upstream source http://invisible-island.net/ncurses/ncurses.html Files: * -Copyright: (C) 1991-2017 Free Software Foundation, Inc. -License: GPL-2+ +Copyright: 2017-2019,2020 Thomas E. Dickey +Copyright: 1991-2017 Free Software Foundation, Inc. +License: GPL-2 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + as published by the Free Software Foundation, version 2. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,7 +20,8 @@ Files: aclocal.m4 Licence: other-BSD -Copyright: 2007-2009,2010 by Free Software Foundation, Inc. +Copyright: 2017-2019,2020 Thomas E. Dickey +Copyright: 2007-2015,2017 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 "Software"), to deal in the Software without restriction, including @@ -45,11 +46,7 @@ sale, use or other dealings in this Software without prior written authorization. - These macros are maintained separately from NCURSES. The copyright on - this file applies to the aggregation of macros and does not affect use of - these macros in other applications. - - See http://invisible-island.net/autoconf/ for additional information. + See https://invisible-island.net/autoconf/ for additional information. Files: install-sh Copyright: 1994 X Consortium @@ -87,7 +84,7 @@ shared with many OS's install programs. Files: debian/* -Copyright: 2010 Thomas E. Dickey +Copyright: 2010-2019,2020 Thomas E. Dickey Licence: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/package/debian/rules new/tack-1.09-20200202/package/debian/rules --- old/tack-1.08-20190721/package/debian/rules 2017-07-23 23:27:27.000000000 +0200 +++ new/tack-1.09-20200202/package/debian/rules 2020-02-02 16:11:06.000000000 +0100 @@ -1,5 +1,5 @@ #!/usr/bin/make -f -# $Id: rules,v 1.3 2017/07/23 21:27:27 tom Exp $ +# $Id: rules,v 1.4 2020/02/02 15:11:06 tom Exp $ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 @@ -65,7 +65,7 @@ install-stamp: build-stamp dh_testdir dh_testroot - dh_clean -k + dh_prep dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tack diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/package/tack.spec new/tack-1.09-20200202/package/tack.spec --- old/tack-1.08-20190721/package/tack.spec 2019-07-21 14:26:44.000000000 +0200 +++ new/tack-1.09-20200202/package/tack.spec 2020-02-02 17:58:47.000000000 +0100 @@ -1,12 +1,12 @@ -Summary: tack - terminfo action checker +Summary: terminfo action checker %define AppProgram tack -%define AppVersion 1.08 -%define AppRelease 20190721 -# $XTermId: tack.spec,v 1.17 2019/07/21 12:26:44 tom Exp $ +%define AppVersion 1.09 +%define AppRelease 20200202 +# $XTermId: tack.spec,v 1.19 2020/02/02 16:58:47 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} -License: GPL2+ +License: GPL2 Group: Applications/Development URL: ftp://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppVersion}-%{AppRelease}.tgz @@ -39,7 +39,7 @@ %install [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/pad.c new/tack-1.09-20200202/pad.c --- old/tack-1.08-20190721/pad.c 2017-08-17 11:20:51.000000000 +0200 +++ new/tack-1.09-20200202/pad.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2010,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2010,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -21,7 +21,7 @@ #include <tack.h> -MODULE_ID("$Id: pad.c,v 1.15 2017/08/17 09:20:51 tom Exp $") +MODULE_ID("$Id: pad.c,v 1.17 2020/02/02 14:47:18 tom Exp $") /* test the pad counts on the terminal */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/scan.c new/tack-1.09-20200202/scan.c --- old/tack-1.08-20190721/scan.c 2017-07-29 02:19:32.000000000 +0200 +++ new/tack-1.09-20200202/scan.c 2020-02-02 16:30:33.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2013,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2012,2013 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ #include <tack.h> -MODULE_ID("$Id: scan.c,v 1.14 2017/07/29 00:19:32 tom Exp $") +MODULE_ID("$Id: scan.c,v 1.17 2020/02/02 15:30:33 tom Exp $") size_t scan_max; /* length of longest scan code */ char **scan_up, **scan_down, **scan_name; @@ -30,180 +30,12 @@ static unsigned *scan_value; static unsigned shift_state; -static char *str; static int debug_char_count; #define SHIFT_KEY 0x100 #define CONTROL_KEY 0x200 #define META_KEY 0x400 #define CAPS_LOCK 0x800 -/* *INDENT-OFF* */ -static const struct { - const char *name; - unsigned type; -} scan_special[] = { - { "<shift>", SHIFT_KEY }, - { "<left shift>", SHIFT_KEY }, - { "<right shift>", SHIFT_KEY }, - { "<control>", CONTROL_KEY }, - { "<left control>", CONTROL_KEY }, - { "<right control>", CONTROL_KEY }, - { "<meta>", META_KEY }, - { "<left meta>", META_KEY }, - { "<right meta>", META_KEY }, - { "<caps lock>", CAPS_LOCK }, - { "<tab>", '\t' }, - { "<space>", ' ' }, - { "<return>", '\r' }, - { "<linefeed>", '\n' }, - { "<formfeed>", '\f' }, - { "<backspace>", '\b' }, - {0, 0} -}; -/* *INDENT-ON* */ - -static void -scan_blanks(void) -{ /* scan past the white space */ - while (*str == ' ' || *str == '\t') - str++; -} - -static char * -smash(void) -{ /* convert a string to hex */ - char *s, *t; - int ch, i, j; - - t = s = str; - for (i = 0; (ch = *str); str++) { - if (ch >= '0' && ch <= '9') - j = ch - '0'; - else if (ch >= 'a' && ch <= 'f') - j = 10 - 'a' + ch; - else if (ch >= 'A' && ch <= 'F') - j = 10 - 'A' + ch; - else if (ch == ' ' || ch == '\t') - break; - else - continue; - if (i) { - *s = (char) (*s | j); - s++; - } else - *s = (char) (j << 4); - i ^= 1; - } - *s = '\0'; - return t; -} - -#define CHUNK 4096 -#define CHUNK_LO (CHUNK - 96) - -void -scan_init(char *fn) -{ /* read the scan mode key definitions */ - char *s, *sl; - FILE *fp; - int ch, i, j; - size_t len; - char home[512]; - - if ((str = getenv("HOME"))) - strcpy(home, str); - else - home[0] = '\0'; - fp = NULL; - if ((str = getenv("KEYBOARD"))) { - if (!(fp = fopen(str, "r")) && home[0]) { - sprintf(temp, "%s/.scan.%s", home, str); - fp = fopen(temp, "r"); - } - } - if (!fp) { - sprintf(temp, ".scan.%s", fn); - fp = fopen(temp, "r"); - } - if (!fp && home[0]) { - sprintf(temp, "%s/.scan.%s", home, fn); - fp = fopen(temp, "r"); - } - if (!fp) { - ptext("Unable to open scanfile: "); - ptextln(temp); - bye_kids(EXIT_FAILURE); - return; - } - /* - scan file format: - - <down value> <up value> <name> - - values are in hex. <name> may be any string of characters - - */ - scan_up = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_down = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_name = (char **) malloc(sizeof(char *) * MAX_SCAN); - scan_tested = (size_t *) malloc(sizeof(size_t) * MAX_SCAN); - scan_length = (size_t *) malloc(sizeof(size_t) * MAX_SCAN); - scan_value = (unsigned *) malloc(sizeof(unsigned) * MAX_SCAN); - scan_up[0] = scan_down[0] = scan_name[0] = (char *) 0; - str = (char *) malloc((size_t) CHUNK); /* buffer space */ - sl = str + CHUNK_LO; /* an upper limit */ - scan_max = 1; - for (i = 0;;) { - for (s = str; (ch = getc(fp)) != EOF;) { - if (ch == '\n' || ch == '\r') - break; - *s++ = (char) ch; - } - *s++ = '\0'; - if (ch == EOF) - break; - if (*str == '#' || *str == '\0') - continue; - scan_down[i] = smash(); - scan_blanks(); - scan_up[i] = smash(); - scan_blanks(); - scan_name[i] = str; - - scan_length[i] = strlen(scan_down[i]); - len = strlen(scan_up[i]) + scan_length[i]; - if (len > scan_max) - scan_max = len; - - scan_value[i] = UChar(scan_name[i][0]); - if (scan_name[i][0] - && scan_name[i][1]) /* multi-character name */ - for (j = 0; scan_special[j].name; j++) { - if (!strcmp(scan_name[i], scan_special[j].name)) { - scan_value[i] = scan_special[j].type; - break; - } - } - - i++; - if (str > sl) { - str = (char *) malloc((size_t) CHUNK); - sl = str + CHUNK_LO; - } else - str = s; - } - fclose(fp); -#ifdef notdef - for (i = 0; scan_down[i]; i++) { - put_str(hex_expand_to(scan_down[i], 3)); - put_str(hex_expand_to(scan_up[i], 3)); - put_str(" "); - put_str(scan_name[i]); - put_crlf(); - } - (void) wait_here(); -#endif -} int scan_key(void) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/sync.c new/tack-1.09-20200202/sync.c --- old/tack-1.08-20190721/sync.c 2017-07-29 01:38:20.000000000 +0200 +++ new/tack-1.09-20200202/sync.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2012,2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ #include <tack.h> #include <time.h> -MODULE_ID("$Id: sync.c,v 1.15 2017/07/28 23:38:20 tom Exp $") +MODULE_ID("$Id: sync.c,v 1.17 2020/02/02 14:47:18 tom Exp $") /* terminal-synchronization and performance tests */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/sysdep.c new/tack-1.09-20200202/sysdep.c --- old/tack-1.08-20190721/sysdep.c 2019-07-21 14:57:58.000000000 +0200 +++ new/tack-1.09-20200202/sysdep.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. +** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 1997-2010,2012 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -44,7 +44,7 @@ #endif #endif -MODULE_ID("$Id: sysdep.c,v 1.28 2019/07/21 12:57:58 tom Exp $") +MODULE_ID("$Id: sysdep.c,v 1.30 2020/02/02 14:47:18 tom Exp $") #ifdef TERMIOS #define PUT_TTY(fd, buf) tcsetattr(fd, TCSAFLUSH, buf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/tack.1 new/tack-1.09-20200202/tack.1 --- old/tack-1.08-20190721/tack.1 2017-07-27 00:31:58.000000000 +0200 +++ new/tack-1.09-20200202/tack.1 2020-02-02 15:47:18.000000000 +0100 @@ -1,5 +1,6 @@ .\"*************************************************************************** -.\" Copyright (c) 1998-2011,2017 Free Software Foundation, Inc. * +.\" Copyright 2020 Thomas E. Dickey * +.\" Copyright 1997-2011,2017 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 * @@ -26,7 +27,7 @@ .\" authorization. * .\"*************************************************************************** .\" -.\" $Id: tack.1,v 1.5 2017/07/26 22:31:58 tom Exp $ +.\" $Id: tack.1,v 1.6 2020/02/02 14:47:18 tom Exp $ .TH tack 1 "" .ie \n(.g .ds `` \(lq .el .ds `` `` diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/tack.c new/tack-1.09-20200202/tack.c --- old/tack-1.08-20190721/tack.c 2019-07-21 21:09:13.000000000 +0200 +++ new/tack-1.09-20200202/tack.c 2020-02-02 18:00:47.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. +** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 1997-2012,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -22,7 +22,7 @@ #include <tack.h> #include <stdarg.h> -MODULE_ID("$Id: tack.c,v 1.28 2019/07/21 19:09:13 tom Exp $") +MODULE_ID("$Id: tack.c,v 1.31 2020/02/02 17:00:47 tom Exp $") /* This program is designed to test terminfo, not curses. Therefore @@ -565,7 +565,8 @@ MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION); - printf("Copyright (C) 1997-2017 Free Software Foundation, Inc.\n"); + printf("Copyright 2017-2020 Thomas E. Dickey\n"); + printf("Copyright 1997-2017 Free Software Foundation, Inc.\n"); printf("Tack comes with NO WARRANTY, to the extent permitted by law.\n"); printf("You may redistribute copies of Tack under the terms of the\n"); printf("GNU General Public License. For more information about\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/tack.h new/tack-1.09-20200202/tack.h --- old/tack-1.08-20190721/tack.h 2019-07-21 21:08:15.000000000 +0200 +++ new/tack-1.09-20200202/tack.h 2020-02-02 17:34:56.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 1991, 1997-2017,2019 Free Software Foundation, Inc. +** Copyright 2017-2019,2020 Thomas E. Dickey +** Copyright 1997-2015,2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -19,7 +19,7 @@ ** Boston, MA 02110-1301, USA */ -/* $Id: tack.h,v 1.74 2019/07/21 19:08:15 tom Exp $ */ +/* $Id: tack.h,v 1.80 2020/02/02 16:34:56 tom Exp $ */ #ifndef NCURSES_TACK_H_incl #define NCURSES_TACK_H_incl 1 @@ -27,8 +27,8 @@ /* terminfo action checker include file */ #define MAJOR_VERSION 1 -#define MINOR_VERSION 8 -#define PATCH_VERSION 20190721 +#define MINOR_VERSION 9 +#define PATCH_VERSION 20200202 #ifdef HAVE_CONFIG_H #include <ncurses_cfg.h> @@ -55,7 +55,11 @@ #endif #ifndef NCURSES_CONST +#ifdef NCURSES_VERSION #define NCURSES_CONST const +#else +#define NCURSES_CONST /*nothing */ +#endif #endif #ifndef NO_LEAKS @@ -201,10 +205,11 @@ } NAME_TYPE; /* see ncurses' nc_tparm.h */ +#define TPARM_FMT NCURSES_CONST char * #define TPARM_ARG long #define TPARM_N(n) (TPARM_ARG)(n) -#define TPARM_9(a,b,c,d,e,f,g,h,i,j) tparm(a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h),TPARM_N(i),TPARM_N(j)) +#define TPARM_9(a,b,c,d,e,f,g,h,i,j) tparm((TPARM_FMT)a,TPARM_N(b),TPARM_N(c),TPARM_N(d),TPARM_N(e),TPARM_N(f),TPARM_N(g),TPARM_N(h),TPARM_N(i),TPARM_N(j)) #define TPARM_8(a,b,c,d,e,f,g,h,i) TPARM_9(a,b,c,d,e,f,g,h,i,0) #define TPARM_7(a,b,c,d,e,f,g,h) TPARM_8(a,b,c,d,e,f,g,h,0) #define TPARM_6(a,b,c,d,e,f,g) TPARM_7(a,b,c,d,e,f,g,0) @@ -213,7 +218,6 @@ #define TPARM_3(a,b,c,d) TPARM_4(a,b,c,d,0) #define TPARM_2(a,b,c) TPARM_3(a,b,c,0) #define TPARM_1(a,b) TPARM_2(a,b,0) -#define TPARM_1(a,b) TPARM_2(a,b,0) #define TPARM_0(a) TPARM_1(a,0) #define UChar(c) ((unsigned char)(c)) @@ -470,7 +474,6 @@ extern void put_columns(const char *, int, int); extern void put_cr(void); extern void put_crlf(void); -extern void put_dec(char *, int); extern void put_ind(void); extern void put_lf(void); extern void put_newlines(int); @@ -479,7 +482,6 @@ extern void putchp(int); extern void putln(const char *); extern void read_string(char *, size_t); -extern void three_digit(char *, int); extern void tt_putp(const char *); extern void tt_putparm(NCURSES_CONST char *, int, int, int); extern void tt_tputs(const char *, int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/tack-1.08-20190721/tackgen.c new/tack-1.09-20200202/tackgen.c --- old/tack-1.08-20190721/tackgen.c 2017-07-29 01:28:52.000000000 +0200 +++ new/tack-1.09-20200202/tackgen.c 2020-02-02 15:47:18.000000000 +0100 @@ -1,12 +1,12 @@ /* -** Copyright (C) 2017 Free Software Foundation, Inc. +** Copyright 2017,2020 Thomas E. Dickey +** Copyright 2017 Free Software Foundation, Inc. ** ** This file is part of TACK. ** ** TACK is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by -** the Free Software Foundation; either version 2, or (at your option) -** any later version. +** the Free Software Foundation, version 2. ** ** TACK is distributed in the hope that it will be useful, ** but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,7 +27,7 @@ #include <curses.h> #include <term.h> -/* $Id: tackgen.c,v 1.10 2017/07/28 23:28:52 tom Exp $ */ +/* $Id: tackgen.c,v 1.12 2020/02/02 14:47:18 tom Exp $ */ #define DATA_FMT "DATA(\t%3d,\t\"%s\",%s%s%s),\t/* %s */\n"
