ncurses 6.3 - patch 20220430

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index 52901f13af53e2db3dd262d88e07ec32cef8d43d..82672fa8ce2ed46693665fb320e9bbce723b527a 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc.              *
+ * Copyright 2018-2021,2022 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            *
@@ -47,10 +48,10 @@
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.107 2019/10/19 20:47:43 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.117 2022/04/30 15:57:27 tom Exp $")
 
 static void sanity_check2(TERMTYPE2 *, bool);
-NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
+NCURSES_IMPEXP void (NCURSES_API *_nc_check_termtype2) (TERMTYPE2 *, bool) = sanity_check2;
 
 static void fixup_acsc(TERMTYPE2 *, int);
 
@@ -58,8 +59,11 @@ static void
 enqueue(ENTRY * ep)
 /* add an entry to the in-core list */
 {
-    ENTRY *newp = _nc_copy_entry(ep);
+    ENTRY *newp;
 
+    DEBUG(1, (T_CALLED("enqueue(ep=%p)"), ep));
+
+    newp = _nc_copy_entry(ep);
     if (newp == 0)
        _nc_err_abort(MSG_NO_MEMORY);
 
@@ -216,6 +220,10 @@ _nc_read_entry_source(FILE *fp, char *buf,
     bool oldsuppress = _nc_suppress_warnings;
     int immediate = 0;
 
+    DEBUG(1,
+         (T_CALLED("_nc_read_entry_source(file=%p, buf=%p, literal=%d, silent=%d, hook=%p)"),
+          fp, buf, literal, silent, hook));
+
     if (silent)
        _nc_suppress_warnings = TRUE;   /* shut the lexer up, too */
 
@@ -254,18 +262,18 @@ _nc_read_entry_source(FILE *fp, char *buf,
        for (_nc_head = _nc_tail; _nc_head->last; _nc_head = _nc_head->last)
            continue;
 
-       DEBUG(1, ("head = %s", _nc_head->tterm.term_names));
-       DEBUG(1, ("tail = %s", _nc_tail->tterm.term_names));
+       DEBUG(2, ("head = %s", _nc_head->tterm.term_names));
+       DEBUG(2, ("tail = %s", _nc_tail->tterm.term_names));
     }
 #ifdef TRACE
     else if (!immediate)
-       DEBUG(1, ("no entries parsed"));
+       DEBUG(2, ("no entries parsed"));
 #endif
 
     _nc_suppress_warnings = oldsuppress;
 }
 
-#if NCURSES_XNAMES
+#if 0 && NCURSES_XNAMES
 static unsigned
 find_capname(TERMTYPE2 *p, const char *name)
 {
@@ -297,7 +305,9 @@ extended_captype(TERMTYPE2 *p, unsigned which)
        } else {
            limit += p->ext_Strings;
            if (limit != 0 && which < limit) {
-               result = STRING;
+               result = ((p->Strings[STRCOUNT + which] != CANCELLED_STRING)
+                         ? STRING
+                         : CANCEL);
            } else if (which >= limit) {
                result = CANCEL;
            }
@@ -353,24 +363,19 @@ invalid_merge(TERMTYPE2 *to, TERMTYPE2 *from)
                && tf <= STRING
                && (tt == STRING) != (tf == STRING)) {
                if (from_name != 0 && strcmp(to_name, from_name)) {
-                   DEBUG(2,
-                         ("merge of %s to %s changes type of %s from %s to %s",
-                          from_name,
-                          to_name,
-                          from->ext_Names[n],
-                          name_of_captype(tf),
-                          name_of_captype(tt)));
+                   _nc_warning("merge of %s to %s changes type of %s from %s to %s",
+                               from_name,
+                               to_name,
+                               from->ext_Names[n],
+                               name_of_captype(tf),
+                               name_of_captype(tt));
                } else {
-                   DEBUG(2, ("merge of %s changes type of %s from %s to %s",
-                             to_name,
-                             from->ext_Names[n],
-                             name_of_captype(tf),
-                             name_of_captype(tt)));
+                   _nc_warning("merge of %s changes type of %s from %s to %s",
+                               to_name,
+                               from->ext_Names[n],
+                               name_of_captype(tf),
+                               name_of_captype(tt));
                }
-               _nc_warning("merge changes type of %s from %s to %s",
-                           from->ext_Names[n],
-                           name_of_captype(tf),
-                           name_of_captype(tt));
                rc = TRUE;
            }
        }
@@ -391,10 +396,10 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
-    unsigned i;
+    unsigned i, j;
     int unresolved, total_unresolved, multiples;
 
-    DEBUG(2, ("RESOLUTION BEGINNING"));
+    DEBUG(2, (T_CALLED("_nc_resolve_uses2")));
 
     /*
      * Check for multiple occurrences of the same name.
@@ -419,8 +424,10 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
            }
        }
     }
-    if (multiples > 0)
+    if (multiples > 0) {
+       DEBUG(2, (T_RETURN("false")));
        return (FALSE);
+    }
 
     DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES"));
 
@@ -453,6 +460,16 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 
                    qp->uses[i].link = rp;
                    foundit = TRUE;
+
+                   /* verify that there are no earlier uses */
+                   for (j = 0; j < i; ++j) {
+                       if (qp->uses[j].link != NULL
+                           && !strcmp(qp->uses[j].link->tterm.term_names,
+                                      rp->tterm.term_names)) {
+                           _nc_warning("duplicate use=%s", lookfor);
+                           break;
+                       }
+                   }
                }
            }
 
@@ -474,6 +491,16 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 
                    qp->uses[i].link = rp;
                    foundit = TRUE;
+
+                   /* verify that there are no earlier uses */
+                   for (j = 0; j < i; ++j) {
+                       if (qp->uses[j].link != NULL
+                           && !strcmp(qp->uses[j].link->tterm.term_names,
+                                      rp->tterm.term_names)) {
+                           _nc_warning("duplicate use=%s", lookfor);
+                           break;
+                       }
+                   }
                }
            }
 
@@ -491,6 +518,7 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
     if (total_unresolved) {
        /* free entries read in off disk */
        _nc_free_entries(lastread);
+       DEBUG(2, (T_RETURN("false")));
        return (FALSE);
     }
 
@@ -613,6 +641,14 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
 
                _nc_check_termtype2(&qp->tterm, literal);
 
+               /*
+                * Checking calls tparm, which can allocate memory.  Fix leaks.
+                */
+#define TPS(name) fake_tm.tparm_state.name
+               FreeAndNull(TPS(out_buff));
+               FreeAndNull(TPS(fmt_buff));
+#undef TPS
+
                _nc_set_screen(save_SP);
                set_curterm(save_tm);
            } else {
@@ -622,6 +658,7 @@ _nc_resolve_uses2(bool fullresolve, bool literal)
        DEBUG(2, ("SANITY CHECK FINISHED"));
     }
 
+    DEBUG(2, (T_RETURN("true")));
     return (TRUE);
 }
 
@@ -724,6 +761,6 @@ NCURSES_EXPORT(void)
 _nc_free_tic(int code)
 {
     _nc_leaks_tic();
-    _nc_free_tinfo(code);
+    exit_terminfo(code);
 }
 #endif