]> ncurses.scripts.mit.edu Git - ncurses.git/blobdiff - ncurses/tinfo/comp_parse.c
ncurses 6.2 - patch 20210227
[ncurses.git] / ncurses / tinfo / comp_parse.c
index 24c4852dcedf026cc54397de4c1740a51ac81bdb..e47625b3dbe1735ff8cd2044bd804d6202ad9a1d 100644 (file)
@@ -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            *
 
 #include <tic.h>
 
-MODULE_ID("$Id: comp_parse.c,v 1.106 2018/05/26 14:16:46 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.112 2021/02/27 21:01:21 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);
 
@@ -180,11 +181,11 @@ remove_collision(char *n1, char *n2)
                        ++qend;
                    while ((*qstart++ = *qend++) != '\0') ;
                    fprintf(stderr, "...now\t%s\n", p2);
+                   removed = TRUE;
                } else {
                    fprintf(stderr, "Cannot remove alias '%.*s'\n",
                            (int) (qend - qstart), qstart);
                }
-               removed = TRUE;
                break;
            }
        }
@@ -391,7 +392,7 @@ _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"));
@@ -453,6 +454,15 @@ _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 (!strcmp(qp->uses[j].link->tterm.term_names,
+                                   rp->tterm.term_names)) {
+                           _nc_warning("duplicate use=%s", lookfor);
+                           break;
+                       }
+                   }
                }
            }
 
@@ -474,6 +484,15 @@ _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 (!strcmp(qp->uses[j].link->tterm.term_names,
+                                   rp->tterm.term_names)) {
+                           _nc_warning("duplicate use=%s", lookfor);
+                           break;
+                       }
+                   }
                }
            }
 
@@ -724,6 +743,6 @@ NCURSES_EXPORT(void)
 _nc_free_tic(int code)
 {
     _nc_leaks_tic();
-    _nc_free_tinfo(code);
+    exit_terminfo(code);
 }
 #endif