ncurses 6.2 - patch 20210911

[ncurses.git] / ncurses / tinfo / read_entry.c

diff --git a/ncurses/tinfo/read_entry.c b/ncurses/tinfo/read_entry.c
index 44811512fbaec600b1fbbb339ba1e8e1a864ca4c..41ef0d0aa2136e6e56ef9a41d8aceace8156d0db 100644 (file)
--- a/ncurses/tinfo/read_entry.c
+++ b/ncurses/tinfo/read_entry.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2017,2018 Free Software Foundation, Inc.              *
+ * Copyright 2018-2020,2021 Thomas E. Dickey                                *
+ * Copyright 1998-2016,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            *
@@ -41,7 +42,7 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: read_entry.c,v 1.147 2018/04/01 01:32:39 tom Exp $")
+MODULE_ID("$Id: read_entry.c,v 1.161 2021/06/26 19:43:17 tom Exp $")
 
 #define TYPE_CALLOC(type,elts) typeCalloc(type, (unsigned)(elts))
 
@@ -57,9 +58,9 @@ convert_16bits(char *buf, NCURSES_INT2 *Numbers, int count)
     int i;
     size_t j;
     size_t size = SIZEOF_SHORT;
-    unsigned char ch;
     for (i = 0; i < count; i++) {
        unsigned mask = 0xff;
+       unsigned char ch = 0;
        Numbers[i] = 0;
        for (j = 0; j < size; ++j) {
            ch = UChar(*buf++);
@@ -159,11 +160,11 @@ convert_strings(char *buf, char **Strings, int count, int size, char *table)
 
        /* make sure all strings are NUL terminated */
        if (VALID_STRING(Strings[i])) {
-           for (p = Strings[i]; p <= table + size; p++)
+           for (p = Strings[i]; p < table + size; p++)
                if (*p == '\0')
                    break;
            /* if there is no NUL, ignore the string */
-           if (p > table + size)
+           if (p >= table + size)
                Strings[i] = ABSENT_STRING;
        }
     }
@@ -256,7 +257,6 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
     char buf[MAX_ENTRY_SIZE + 2];
     char *string_table;
     unsigned want, have;
-    bool need_ints;
     size_t (*convert_numbers) (char *, NCURSES_INT2 *, int);
     int size_of_numbers;
     int max_entry_size = MAX_ENTRY_SIZE;
@@ -275,7 +275,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
        returnDB(TGETENT_NO);
     }
 #if NCURSES_EXT_NUMBERS
-    if ((need_ints = (LOW_MSB(buf) == MAGIC2))) {
+    if (LOW_MSB(buf) == MAGIC2) {
        convert_numbers = convert_32bits;
        size_of_numbers = SIZEOF_INT2;
     } else {
@@ -284,7 +284,7 @@ _nc_read_termtype(TERMTYPE2 *ptr, char *buffer, int limit)
        size_of_numbers = SIZEOF_SHORT;
     }
 #else
-    if ((need_ints = (LOW_MSB(buf) == MAGIC2))) {
+    if (LOW_MSB(buf) == MAGIC2) {
        convert_numbers = convert_32bits;
        size_of_numbers = SIZEOF_32BITS;
     } else {
@@ -552,7 +552,7 @@ _nc_read_file_entry(const char *const filename, TERMTYPE2 *ptr)
     int code;
 
     if (_nc_access(filename, R_OK) < 0
-       || (fp = fopen(filename, "rb")) == 0) {
+       || (fp = safe_fopen(filename, BIN_R)) == 0) {
        TR(TRACE_DATABASE, ("cannot open terminfo %s (errno=%d)", filename, errno));
        code = TGETENT_NO;
     } else {
@@ -665,11 +665,10 @@ decode_hex(const char **source)
 {
     int result = 0;
     int nibble;
-    int ch;
 
     for (nibble = 0; nibble < 2; ++nibble) {
+       int ch = UChar(**source);
        result <<= 4;
-       ch = UChar(**source);
        *source += 1;
        if (ch >= '0' && ch <= '9') {
            ch -= '0';
@@ -694,7 +693,7 @@ decode_quickdump(char *target, const char *source)
     char *base = target;
     int result = 0;
 
-    if (!strncmp(source, "b64:", 4)) {
+    if (!strncmp(source, "b64:", (size_t) 4)) {
        source += 4;
        while (*source != '\0') {
            int bits[4];
@@ -712,7 +711,7 @@ decode_quickdump(char *target, const char *source)
                }
            }
        }
-    } else if (!strncmp(source, "hex:", 4)) {
+    } else if (!strncmp(source, "hex:", (size_t) 4)) {
        source += 4;
        while (*source != '\0') {
            int ch = decode_hex(&source);
@@ -749,10 +748,14 @@ _nc_read_tic_entry(char *filename,
        (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
-       && _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));
+       /* shorten name shown by infocmp */
+       _nc_STRCPY(filename, "$TERMINFO", limit);
     } else
 #if USE_HASHED_DB
        if (make_db_filename(filename, limit, path)
@@ -771,7 +774,7 @@ _nc_read_tic_entry(char *filename,
         * looking for compiled (binary) terminfo data.
         *
         * cgetent uses a two-level lookup.  On the first it uses the given
-        * name to return a record containing only the aliases for an entry. 
+        * name to return a record containing only the aliases for an entry.
         * On the second (using that list of aliases as a key), it returns the
         * content of the terminal description.  We expect second lookup to
         * return data beginning with the same set of aliases.
@@ -817,7 +820,7 @@ _nc_read_tic_entry(char *filename,
        code = _nc_read_file_entry(filename, tp);
     }
 #if NCURSES_USE_TERMCAP
-    else if (code != TGETENT_YES) {
+    if (code != TGETENT_YES) {
        code = _nc_read_termcap_entry(name, tp);
        _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
                    "%.*s", PATH_MAX - 1, _nc_get_source());
@@ -828,7 +831,7 @@ _nc_read_tic_entry(char *filename,
 #endif /* NCURSES_USE_DATABASE */
 
 /*
- * Find and read the compiled entry for a given terminal type, if it exists. 
+ * Find and read the compiled entry for a given terminal type, if it exists.
  * We take pains here to make sure no combination of environment variables and
  * terminal type name can be used to overrun the file buffer.
  */
@@ -837,6 +840,9 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t
 {
     int code = TGETENT_NO;
 
+    if (name == 0)
+       return _nc_read_entry2("", filename, tp);
+
     _nc_SPRINTF(filename, _nc_SLIMIT(PATH_MAX)
                "%.*s", PATH_MAX - 1, name);
 
@@ -874,7 +880,7 @@ _nc_read_entry2(const char *const name, char *const filename, TERMTYPE2 *const t
 
 #if NCURSES_EXT_NUMBERS
 /*
- * This entrypoint is used by tack.
+ * This entrypoint is used by tack 1.07
  */
 NCURSES_EXPORT(int)
 _nc_read_entry(const char *const name, char *const filename, TERMTYPE *const tp)