]> ncurses.scripts.mit.edu Git - ncurses.git/commitdiff
projects / ncurses.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 4bbfbf8)
ncurses 6.1 - patch 20181117
authorThomas E. Dickey <dickey@invisible-island.net>
Sun, 18 Nov 2018 00:22:59 +0000 (00:22 +0000)
committerThomas E. Dickey <dickey@invisible-island.net>
Sun, 18 Nov 2018 00:22:59 +0000 (00:22 +0000)
+ ignore the hex/b64 $TERMINFO in toe's listing.
+ correct a status-check in _nc_read_tic_entry() so that if reading
  a hex/b64 $TERMINFO, and the $TERM does not match, fall-through to
  the compiled-in search list.

12 files changed:
NEWS patch | blob | history
VERSION patch | blob | history
dist.mk patch | blob | history
ncurses/tinfo/read_entry.c patch | blob | history
package/debian-mingw/changelog patch | blob | history
package/debian-mingw64/changelog patch | blob | history
package/debian/changelog patch | blob | history
package/mingw-ncurses.nsi patch | blob | history
package/mingw-ncurses.spec patch | blob | history
package/ncurses.spec patch | blob | history
package/ncursest.spec patch | blob | history
progs/toe.c patch | blob | history

diff --git a/NEWS b/NEWS
index 2c0b87eb9c1316879a2ee3d0787071043b93e372..9d0080f74ed0da247332779ea4c43b8eea8fbef4 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.3211 2018/11/11 01:36:45 tom Exp $
+-- $Id: NEWS,v 1.3214 2018/11/17 22:45:23 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,12 @@ 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.
 
+20181117
+       + ignore the hex/b64 $TERMINFO in toe's listing.
+       + correct a status-check in _nc_read_tic_entry() so that if reading
+         a hex/b64 $TERMINFO, and the $TERM does not match, fall-through to
+         the compiled-in search list.
+
 20181110
        + several workarounds to ensure proper C compiler used in parts of
          Ada95 tree.
 20181110
        + several workarounds to ensure proper C compiler used in parts of
          Ada95 tree.
diff --git a/VERSION b/VERSION
index 30b506a5d4186f52345479e7d25f18b9d1add2a6..49af1a1d8435f81c19b1d6065f955973fc1b4bbd 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.1     20181110
+5:0:10 6.1     20181117
diff --git a/dist.mk b/dist.mk
index 90cd41912e79141728e5cbb9c25497215c943bc1..f5c59c58dc5dbdf9760c8bb64028937b599bef29 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.1250 2018/11/10 17:09:13 tom Exp $
+# $Id: dist.mk,v 1.1251 2018/11/17 15:41:00 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 = 20181110
+NCURSES_PATCH = 20181117
 
 # 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/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index e56c5a1ff14057a463c33c7eb7a7b9e6d7d9a654..3b020992d18a8d3571df7ad05f8db3ccc1ac3618 100644 (file)
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -41,7 +41,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.148 2018/04/14 17:43:37 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.150 2018/11/17 21:40:10 tom Exp $")
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
@@ -749,10 +749,13 @@ _nc_read_tic_entry(char *filename,
        (T_CALLED("_nc_read_tic_entry(file=%p, path=%s, name=%s)"),
        filename, path, name));
 
        (T_CALLED("_nc_read_tic_entry(file=%p, path=%s, name=%s)"),
        filename, path, name));
 
+    assert(TGETENT_YES == TRUE);       /* simplify call for _nc_name_match */
+
     if ((used = decode_quickdump(buffer, path)) != 0
        && (code = _nc_read_termtype(tp, buffer, used)) == TGETENT_YES
     if ((used = decode_quickdump(buffer, path)) != 0
        && (code = _nc_read_termtype(tp, buffer, used)) == TGETENT_YES
-       && _nc_name_match(tp->term_names, name, "|")) {
+       && (code = _nc_name_match(tp->term_names, name, "|")) == TGETENT_YES) {
        TR(TRACE_DATABASE, ("loaded quick-dump for %s", name));
        TR(TRACE_DATABASE, ("loaded quick-dump for %s", name));
+       strcpy(filename, "$TERMINFO");  /* shorten name shown by infocmp */
     } else
 #if USE_HASHED_DB
        if (make_db_filename(filename, limit, path)
     } else
 #if USE_HASHED_DB
        if (make_db_filename(filename, limit, path)
diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index a3a212d831f778566384a8c99987273b4b83e3d7..1a205265927aa273f355dc7326feaa880c42149d 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181110) unstable; urgency=low
+ncurses6 (6.1+20181117) unstable; urgency=low
 
   * latest weekly patch
 
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Nov 2018 12:09:14 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Nov 2018 10:41:00 -0500
 
 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 a3a212d831f778566384a8c99987273b4b83e3d7..1a205265927aa273f355dc7326feaa880c42149d 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181110) unstable; urgency=low
+ncurses6 (6.1+20181117) unstable; urgency=low
 
   * latest weekly patch
 
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Nov 2018 12:09:14 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Nov 2018 10:41:00 -0500
 
 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 620ae6b3e93f07b02da8ebcbf71b8a38dee7c471..1f88275c3a96512e77192193db1a6a2331621454 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.1+20181110) unstable; urgency=low
+ncurses6 (6.1+20181117) unstable; urgency=low
 
   * latest weekly patch
 
 
   * latest weekly patch
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 10 Nov 2018 12:09:14 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 17 Nov 2018 10:41:00 -0500
 
 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 8abcc5e90478e32703a27097c75368eb31bcdfbf..9d801cbef1ef81e6cae96125500c2920eb48b5ba 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.297 2018/11/10 17:09:13 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.298 2018/11/17 15:41:00 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  "2018"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "1"\r
 !define VERSION_YYYY  "2018"\r
-!define VERSION_MMDD  "1110"\r
+!define VERSION_MMDD  "1117"\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 ad99d4877dc47e2c363c34c9191d1921e5fd6b33..f673d2cbb25c480a107cdf9527eed4b76a70bbbb 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: 20181110
+Release: 20181117
 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 5cf9d2c1131e2496c197a2508060fa7bd6ef0f48..b3c22c776905de604797975f99400112386e12ee 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: 20181110
+Release: 20181117
 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 e400219be493191e82f99be07021d71ec38b12d3..c140e94cba37a1bf78dcb1d08356bdc8ef51443a 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: 20181110
+Release: 20181117
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
diff --git a/progs/toe.c b/progs/toe.c
index 5abb46de1ea90875b9256a63e1ab79b298309933..7b9f79ad6d8d55717ffb821b557fde1278be4e60 100644 (file)
--- a/progs/toe.c
+++ b/progs/toe.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************
- * Copyright (c) 1998-2013,2017 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2018 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            *
@@ -44,7 +44,7 @@
 #include <hashed_db.h>
 #endif
 
 #include <hashed_db.h>
 #endif
 
-MODULE_ID("$Id: toe.c,v 1.77 2017/12/23 19:23:40 tom Exp $")
+MODULE_ID("$Id: toe.c,v 1.78 2018/11/17 22:41:46 tom Exp $")
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
 
 #define isDotname(name) (!strcmp(name, ".") || !strcmp(name, ".."))
 
@@ -497,8 +497,8 @@ typelist(int eargc, char *eargv[],
                }
            }
        }
                }
            }
        }
-#endif
-#endif
+#endif /* USE_HASHED_DB */
+#endif /* NCURSES_USE_DATABASE */
 #if NCURSES_USE_TERMCAP
 #if HAVE_BSD_CGETENT
        {
 #if NCURSES_USE_TERMCAP
 #if HAVE_BSD_CGETENT
        {
@@ -700,6 +700,8 @@ main(int argc, char *argv[])
 
            _nc_first_db(&state, &offset);
            while ((path = _nc_next_db(&state, &offset)) != 0) {
 
            _nc_first_db(&state, &offset);
            while ((path = _nc_next_db(&state, &offset)) != 0) {
+               if (quick_prefix(path))
+                   continue;
                if (pass) {
                    eargv[count] = strmalloc(path);
                }
                if (pass) {
                    eargv[count] = strmalloc(path);
                }
@@ -725,7 +727,8 @@ main(int argc, char *argv[])
            failed("eargv");
        _nc_first_db(&state, &offset);
        if ((path = _nc_next_db(&state, &offset)) != 0) {
            failed("eargv");
        _nc_first_db(&state, &offset);
        if ((path = _nc_next_db(&state, &offset)) != 0) {
-           eargv[count++] = strmalloc(path);
+           if (!quick_prefix(path))
+               eargv[count++] = strmalloc(path);
        }
 
        code = typelist((int) count, eargv, header, hook);
        }
 
        code = typelist((int) count, eargv, header, hook);
ncurses, with patches starting at ncurses-5.6; new users should use https://github.com/ThomasDickey/ncurses-snapshots/