ncurses 6.0 - patch 20170318
[ncurses.git] / ncurses / tinfo / comp_parse.c
index ca58bb5746e76ebed0c670789a84f097c50d175c..9a0ce487b167b38c6e8e31e46c5f8420bb117c23 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************
- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2013,2016 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            *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
 /*
  *     comp_parse.c -- parser driver loop and use handling.
  *
  ****************************************************************************/
 
 /*
  *     comp_parse.c -- parser driver loop and use handling.
  *
- *     _nc_read_entry_source(FILE *, literal, bool, bool (*hook)())
- *     _nc_resolve_uses(void)
- *     _nc_free_entries(void)
- *
  *     Use this code by calling _nc_read_entry_source() on as many source
  *     files as you like (either terminfo or termcap syntax).  If you
  *     Use this code by calling _nc_read_entry_source() on as many source
  *     files as you like (either terminfo or termcap syntax).  If you
- *     want use-resolution, call _nc_resolve_uses().  To free the list
+ *     want use-resolution, call _nc_resolve_uses2().  To free the list
  *     storage, do _nc_free_entries().
  *     storage, do _nc_free_entries().
- *
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>
-#include <term_entry.h>
 
 
-MODULE_ID("$Id: comp_parse.c,v 1.40 2000/04/15 16:57:08 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.92 2016/09/10 20:08:32 tom Exp $")
 
 
-static void sanity_check(TERMTYPE *);
-void (*_nc_check_termtype) (TERMTYPE *) = sanity_check;
+static void sanity_check2(TERMTYPE *, bool);
+NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
 
 
-/****************************************************************************
- *
- * Entry queue handling
- *
- ****************************************************************************/
-/*
- *  The entry list is a doubly linked list with NULLs terminating the lists:
- *
- *       ---------   ---------   ---------
- *       |       |   |       |   |       |   offset
- *        |-------|   |-------|   |-------|
- *       |   ----+-->|   ----+-->|  NULL |   next
- *       |-------|   |-------|   |-------|
- *       |  NULL |<--+----   |<--+----   |   last
- *       ---------   ---------   ---------
- *           ^                       ^
- *           |                       |
- *           |                       |
- *        _nc_head                _nc_tail
- */
+/* obsolete: 20040705 */
+static void sanity_check(TERMTYPE *);
+NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
 
 
-ENTRY *_nc_head = 0, *_nc_tail = 0;
+static void fixup_acsc(TERMTYPE *, int);
 
 static void
 enqueue(ENTRY * ep)
 
 static void
 enqueue(ENTRY * ep)
@@ -87,7 +65,7 @@ enqueue(ENTRY * ep)
     ENTRY *newp = _nc_copy_entry(ep);
 
     if (newp == 0)
     ENTRY *newp = _nc_copy_entry(ep);
 
     if (newp == 0)
-       _nc_err_abort("Out of memory");
+       _nc_err_abort(MSG_NO_MEMORY);
 
     newp->last = _nc_tail;
     _nc_tail = newp;
 
     newp->last = _nc_tail;
     _nc_tail = newp;
@@ -97,71 +75,145 @@ enqueue(ENTRY * ep)
        newp->last->next = newp;
 }
 
        newp->last->next = newp;
 }
 
-void
-_nc_free_entries(ENTRY * headp)
-/* free the allocated storage consumed by list entries */
+#define NAMEBUFFER_SIZE (MAX_NAME_SIZE + 2)
+
+static char *
+force_bar(char *dst, char *src)
 {
 {
-    ENTRY *ep, *next;
+    if (strchr(src, '|') == 0) {
+       size_t len = strlen(src);
+       if (len > MAX_NAME_SIZE)
+           len = MAX_NAME_SIZE;
+       _nc_STRNCPY(dst, src, len);
+       _nc_STRCPY(dst + len, "|", NAMEBUFFER_SIZE - len);
+       src = dst;
+    }
+    return src;
+}
+#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src)
 
 
-    for (ep = headp; ep; ep = next) {
-       /*
-        * This conditional lets us disconnect storage from the list.
-        * To do this, copy an entry out of the list, then null out
-        * the string-table member in the original and any use entries
-        * it references.
-        */
-       FreeIfNeeded(ep->tterm.str_table);
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+static char *
+skip_index(char *name)
+{
+    char *bar = strchr(name, '|');
 
 
-       next = ep->next;
+    if (bar != 0 && (bar - name) == 2)
+       name = bar + 1;
 
 
-       free(ep);
-       if (ep == _nc_head)
-           _nc_head = 0;
-       if (ep == _nc_tail)
-           _nc_tail = 0;
-    }
+    return name;
 }
 }
+#endif
 
 
-bool
-_nc_entry_match(char *n1, char *n2)
-/* do any of the aliases in a pair of terminal names match? */
+static bool
+check_collisions(char *n1, char *n2, int counter)
 {
     char *pstart, *qstart, *pend, *qend;
 {
     char *pstart, *qstart, *pend, *qend;
-    char nc1[MAX_NAME_SIZE + 1], nc2[MAX_NAME_SIZE + 1];
+    char nc1[NAMEBUFFER_SIZE];
+    char nc2[NAMEBUFFER_SIZE];
 
 
-    if (strchr(n1, '|') == 0) {
-       (void) strncpy(nc1, n1, sizeof(nc1) - 2);
-       nc1[sizeof(nc1) - 2] = '\0';
-       (void) strcat(nc1, "|");
-       n1 = nc1;
-    }
+    n1 = ForceBar(nc1, n1);
+    n2 = ForceBar(nc2, n2);
 
 
-    if (strchr(n2, '|') == 0) {
-       (void) strncpy(nc2, n2, sizeof(nc2) - 2);
-       nc2[sizeof(nc2) - 2] = '\0';
-       (void) strcat(nc2, "|");
-       n2 = nc2;
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
+       n1 = skip_index(n1);
+       n2 = skip_index(n2);
     }
     }
+#endif
 
 
-    for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1)
-       for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1)
+    for (pstart = n1; (pend = strchr(pstart, '|')); pstart = pend + 1) {
+       for (qstart = n2; (qend = strchr(qstart, '|')); qstart = qend + 1) {
            if ((pend - pstart == qend - qstart)
            if ((pend - pstart == qend - qstart)
-               && memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0)
+               && memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) {
+               if (counter > 0)
+                   (void) fprintf(stderr, "Name collision '%.*s' between\n",
+                                  (int) (pend - pstart), pstart);
                return (TRUE);
                return (TRUE);
+           }
+       }
+    }
 
     return (FALSE);
 }
 
 
     return (FALSE);
 }
 
+static char *
+next_name(char *name)
+{
+    if (*name != '\0')
+       ++name;
+    return name;
+}
+
+static char *
+name_ending(char *name)
+{
+    if (*name == '\0') {
+       name = 0;
+    } else {
+       while (*name != '\0' && *name != '|')
+           ++name;
+    }
+    return name;
+}
+
+/*
+ * Essentially, find the conflict reported in check_collisions() and remove
+ * it from the second name, unless that happens to be the last alias.
+ */
+static bool
+remove_collision(char *n1, char *n2)
+{
+    char *p2 = n2;
+    char *pstart, *qstart, *pend, *qend;
+    bool removed = FALSE;
+
+#if NCURSES_USE_TERMCAP && NCURSES_XNAMES
+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
+       n1 = skip_index(n1);
+       p2 = n2 = skip_index(n2);
+    }
+#endif
+
+    for (pstart = n1; (pend = name_ending(pstart)); pstart = next_name(pend)) {
+       for (qstart = n2; (qend = name_ending(qstart)); qstart = next_name(qend)) {
+           if ((pend - pstart == qend - qstart)
+               && memcmp(pstart, qstart, (size_t) (pend - pstart)) == 0) {
+               if (qstart != p2 || *qend == '|') {
+                   if (*qend == '|')
+                       ++qend;
+                   while ((*qstart++ = *qend++) != '\0') ;
+                   fprintf(stderr, "...now\t%s\n", p2);
+               } else {
+                   fprintf(stderr, "Cannot remove alias '%.*s'\n",
+                           (int) (qend - qstart), qstart);
+               }
+               removed = TRUE;
+               break;
+           }
+       }
+    }
+
+    return removed;
+}
+
+/* do any of the aliases in a pair of terminal names match? */
+NCURSES_EXPORT(bool)
+_nc_entry_match(char *n1, char *n2)
+{
+    return check_collisions(n1, n2, 0);
+}
+
 /****************************************************************************
  *
  * Entry compiler and resolution logic
  *
  ****************************************************************************/
 
 /****************************************************************************
  *
  * Entry compiler and resolution logic
  *
  ****************************************************************************/
 
-void
-_nc_read_entry_source(FILE * fp, char *buf,
-    int literal, bool silent,
-    bool(*hook) (ENTRY *))
+NCURSES_EXPORT(void)
+_nc_read_entry_source(FILE *fp, char *buf,
+                     int literal, bool silent,
+                     bool(*hook) (ENTRY *))
 /* slurp all entries in the given file into core */
 {
     ENTRY thisentry;
 /* slurp all entries in the given file into core */
 {
     ENTRY thisentry;
@@ -176,18 +228,29 @@ _nc_read_entry_source(FILE * fp, char *buf,
        memset(&thisentry, 0, sizeof(thisentry));
        if (_nc_parse_entry(&thisentry, literal, silent) == ERR)
            break;
        memset(&thisentry, 0, sizeof(thisentry));
        if (_nc_parse_entry(&thisentry, literal, silent) == ERR)
            break;
-       if (!isalnum(thisentry.tterm.term_names[0]))
+       if (!isalnum(UChar(thisentry.tterm.term_names[0])))
            _nc_err_abort("terminal names must start with letter or digit");
 
        /*
            _nc_err_abort("terminal names must start with letter or digit");
 
        /*
-        * This can be used for immediate compilation of entries with no
-        * use references to disk, so as to avoid chewing up a lot of
-        * core when the resolution code could fetch entries off disk.
+        * This can be used for immediate compilation of entries with no "use="
+        * references to disk.  That avoids consuming a lot of memory when the
+        * resolution code could fetch entries off disk.
         */
         */
-       if (hook != NULLHOOK && (*hook) (&thisentry))
+       if (hook != NULLHOOK && (*hook) (&thisentry)) {
            immediate++;
            immediate++;
-       else
+       } else {
            enqueue(&thisentry);
            enqueue(&thisentry);
+           /*
+            * The enqueued entry is copied with _nc_copy_termtype(), so we can
+            * free some of the data from thisentry, i.e., the arrays.
+            */
+           FreeIfNeeded(thisentry.tterm.Booleans);
+           FreeIfNeeded(thisentry.tterm.Numbers);
+           FreeIfNeeded(thisentry.tterm.Strings);
+#if NCURSES_XNAMES
+           FreeIfNeeded(thisentry.tterm.ext_Names);
+#endif
+       }
     }
 
     if (_nc_tail) {
     }
 
     if (_nc_tail) {
@@ -206,13 +269,14 @@ _nc_read_entry_source(FILE * fp, char *buf,
     _nc_suppress_warnings = oldsuppress;
 }
 
     _nc_suppress_warnings = oldsuppress;
 }
 
-int
-_nc_resolve_uses(bool fullresolve)
+NCURSES_EXPORT(int)
+_nc_resolve_uses2(bool fullresolve, bool literal)
 /* try to resolve all use capabilities */
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
 /* try to resolve all use capabilities */
 {
     ENTRY *qp, *rp, *lastread = 0;
     bool keepgoing;
-    int i, j, unresolved, total_unresolved, multiples;
+    unsigned i;
+    int unresolved, total_unresolved, multiples;
 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 
 
     DEBUG(2, ("RESOLUTION BEGINNING"));
 
@@ -223,20 +287,21 @@ _nc_resolve_uses(bool fullresolve)
     for_entry_list(qp) {
        int matchcount = 0;
 
     for_entry_list(qp) {
        int matchcount = 0;
 
-       for_entry_list(rp)
+       for_entry_list(rp) {
            if (qp > rp
            if (qp > rp
-           && _nc_entry_match(qp->tterm.term_names, rp->tterm.term_names)) {
-           matchcount++;
-           if (matchcount == 1) {
-               (void) fprintf(stderr, "Name collision between %s",
-                   _nc_first_name(qp->tterm.term_names));
-               multiples++;
+               && check_collisions(qp->tterm.term_names,
+                                   rp->tterm.term_names,
+                                   matchcount + 1)) {
+               if (!matchcount++) {
+                   (void) fprintf(stderr, "\t%s\n", rp->tterm.term_names);
+               }
+               (void) fprintf(stderr, "and\t%s\n", qp->tterm.term_names);
+               if (!remove_collision(rp->tterm.term_names,
+                                     qp->tterm.term_names)) {
+                   ++multiples;
+               }
            }
            }
-           if (matchcount >= 1)
-               (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names));
        }
        }
-       if (matchcount >= 1)
-           (void) putc('\n', stderr);
     }
     if (multiples > 0)
        return (FALSE);
     }
     if (multiples > 0)
        return (FALSE);
@@ -261,14 +326,15 @@ _nc_resolve_uses(bool fullresolve)
            _nc_set_type(child);
 
            /* first, try to resolve from in-core records */
            _nc_set_type(child);
 
            /* first, try to resolve from in-core records */
-           for_entry_list(rp)
+           for_entry_list(rp) {
                if (rp != qp
                if (rp != qp
-               && _nc_name_match(rp->tterm.term_names, lookfor, "|")) {
-               DEBUG(2, ("%s: resolving use=%s (in core)",
-                       child, lookfor));
+                   && _nc_name_match(rp->tterm.term_names, lookfor, "|")) {
+                   DEBUG(2, ("%s: resolving use=%s (in core)",
+                             child, lookfor));
 
 
-               qp->uses[i].link = rp;
-               foundit = TRUE;
+                   qp->uses[i].link = rp;
+                   foundit = TRUE;
+               }
            }
 
            /* if that didn't work, try to merge in a compiled entry */
            }
 
            /* if that didn't work, try to merge in a compiled entry */
@@ -279,11 +345,9 @@ _nc_resolve_uses(bool fullresolve)
                memset(&thisterm, 0, sizeof(thisterm));
                if (_nc_read_entry(lookfor, filename, &thisterm) == 1) {
                    DEBUG(2, ("%s: resolving use=%s (compiled)",
                memset(&thisterm, 0, sizeof(thisterm));
                if (_nc_read_entry(lookfor, filename, &thisterm) == 1) {
                    DEBUG(2, ("%s: resolving use=%s (compiled)",
-                           child, lookfor));
+                             child, lookfor));
 
 
-                   rp = typeMalloc(ENTRY, 1);
-                   if (rp == 0)
-                       _nc_err_abort("Out of memory");
+                   TYPE_MALLOC(ENTRY, 1, rp);
                    rp->tterm = thisterm;
                    rp->nuses = 0;
                    rp->next = lastread;
                    rp->tterm = thisterm;
                    rp->nuses = 0;
                    rp->next = lastread;
@@ -299,7 +363,7 @@ _nc_resolve_uses(bool fullresolve)
                unresolved++;
                total_unresolved++;
 
                unresolved++;
                total_unresolved++;
 
-               _nc_curr_line = lookline;
+               _nc_curr_line = (int) lookline;
                _nc_warning("resolution of use=%s failed", lookfor);
                qp->uses[i].link = 0;
            }
                _nc_warning("resolution of use=%s failed", lookfor);
                qp->uses[i].link = 0;
            }
@@ -314,8 +378,8 @@ _nc_resolve_uses(bool fullresolve)
     DEBUG(2, ("NAME RESOLUTION COMPLETED OK"));
 
     /*
     DEBUG(2, ("NAME RESOLUTION COMPLETED OK"));
 
     /*
-     * OK, at this point all (char *) references in `name' mwmbers
-     * have been successfully converred to (ENTRY *) pointers in
+     * OK, at this point all (char *) references in `name' members
+     * have been successfully converted to (ENTRY *) pointers in
      * `link' members.  Time to do the actual merges.
      */
     if (fullresolve) {
      * `link' members.  Time to do the actual merges.
      */
     if (fullresolve) {
@@ -327,7 +391,7 @@ _nc_resolve_uses(bool fullresolve)
            for_entry_list(qp) {
                if (qp->nuses > 0) {
                    DEBUG(2, ("%s: attempting merge",
            for_entry_list(qp) {
                if (qp->nuses > 0) {
                    DEBUG(2, ("%s: attempting merge",
-                           _nc_first_name(qp->tterm.term_names)));
+                             _nc_first_name(qp->tterm.term_names)));
                    /*
                     * If any of the use entries we're looking for is
                     * incomplete, punt.  We'll catch this entry on a
                    /*
                     * If any of the use entries we're looking for is
                     * incomplete, punt.  We'll catch this entry on a
@@ -336,15 +400,15 @@ _nc_resolve_uses(bool fullresolve)
                    for (i = 0; i < qp->nuses; i++)
                        if (qp->uses[i].link->nuses) {
                            DEBUG(2, ("%s: use entry %d unresolved",
                    for (i = 0; i < qp->nuses; i++)
                        if (qp->uses[i].link->nuses) {
                            DEBUG(2, ("%s: use entry %d unresolved",
-                                   _nc_first_name(qp->tterm.term_names), i));
+                                     _nc_first_name(qp->tterm.term_names), i));
                            goto incomplete;
                        }
 
                    /*
                            goto incomplete;
                        }
 
                    /*
-                      * First, make sure there's no garbage in the
-                      * merge block.  as a side effect, copy into
-                      * the merged entry the name field and string
-                      * table pointer.
+                    * First, make sure there is no garbage in the
+                    * merge block.  As a side effect, copy into
+                    * the merged entry the name field and string
+                    * table pointer.
                     */
                    _nc_copy_termtype(&merged, &(qp->tterm));
 
                     */
                    _nc_copy_termtype(&merged, &(qp->tterm));
 
@@ -354,7 +418,7 @@ _nc_resolve_uses(bool fullresolve)
                     */
                    for (; qp->nuses; qp->nuses--)
                        _nc_merge_entry(&merged,
                     */
                    for (; qp->nuses; qp->nuses--)
                        _nc_merge_entry(&merged,
-                           &qp->uses[qp->nuses - 1].link->tterm);
+                                       &qp->uses[qp->nuses - 1].link->tterm);
 
                    /*
                     * Now merge in the original entry.
 
                    /*
                     * Now merge in the original entry.
@@ -367,7 +431,11 @@ _nc_resolve_uses(bool fullresolve)
                    FreeIfNeeded(qp->tterm.Booleans);
                    FreeIfNeeded(qp->tterm.Numbers);
                    FreeIfNeeded(qp->tterm.Strings);
                    FreeIfNeeded(qp->tterm.Booleans);
                    FreeIfNeeded(qp->tterm.Numbers);
                    FreeIfNeeded(qp->tterm.Strings);
+#if NCURSES_XNAMES
+                   FreeIfNeeded(qp->tterm.ext_Names);
+#endif
                    qp->tterm = merged;
                    qp->tterm = merged;
+                   _nc_wrap_entry(qp, TRUE);
 
                    /*
                     * We know every entry is resolvable because name resolution
 
                    /*
                     * We know every entry is resolvable because name resolution
@@ -382,23 +450,6 @@ _nc_resolve_uses(bool fullresolve)
            (keepgoing);
 
        DEBUG(2, ("MERGES COMPLETED OK"));
            (keepgoing);
 
        DEBUG(2, ("MERGES COMPLETED OK"));
-
-       /*
-        * The exit condition of the loop above is such that all entries
-        * must now be resolved.  Now handle cancellations.  In a resolved
-        * entry there should be no cancellation markers.
-        */
-       for_entry_list(qp) {
-           for_each_boolean(j, &(qp->tterm))
-               if (qp->tterm.Booleans[j] == CANCELLED_BOOLEAN)
-               qp->tterm.Booleans[j] = ABSENT_BOOLEAN;
-           for_each_number(j, &(qp->tterm))
-               if (qp->tterm.Numbers[j] == CANCELLED_NUMERIC)
-               qp->tterm.Numbers[j] = ABSENT_NUMERIC;
-           for_each_string(j, &(qp->tterm))
-               if (qp->tterm.Strings[j] == CANCELLED_STRING)
-               qp->tterm.Strings[j] = ABSENT_STRING;
-       }
     }
 
     /*
     }
 
     /*
@@ -414,9 +465,36 @@ _nc_resolve_uses(bool fullresolve)
        if (_nc_check_termtype != 0) {
            _nc_curr_col = -1;
            for_entry_list(qp) {
        if (_nc_check_termtype != 0) {
            _nc_curr_col = -1;
            for_entry_list(qp) {
-               _nc_curr_line = qp->startline;
+               _nc_curr_line = (int) qp->startline;
                _nc_set_type(_nc_first_name(qp->tterm.term_names));
                _nc_set_type(_nc_first_name(qp->tterm.term_names));
-               _nc_check_termtype(&qp->tterm);
+               /*
+                * tic overrides this function pointer to provide more verbose
+                * checking.
+                */
+               if (_nc_check_termtype2 != sanity_check2) {
+                   SCREEN *save_SP = SP;
+                   SCREEN fake_sp;
+                   TERMINAL fake_tm;
+                   TERMINAL *save_tm = cur_term;
+
+                   /*
+                    * Setup so that tic can use ordinary terminfo interface
+                    * to obtain capability information.
+                    */
+                   memset(&fake_sp, 0, sizeof(fake_sp));
+                   memset(&fake_tm, 0, sizeof(fake_tm));
+                   fake_sp._term = &fake_tm;
+                   fake_tm.type = qp->tterm;
+                   _nc_set_screen(&fake_sp);
+                   set_curterm(&fake_tm);
+
+                   _nc_check_termtype2(&qp->tterm, literal);
+
+                   _nc_set_screen(save_SP);
+                   set_curterm(save_tm);
+               } else {
+                   fixup_acsc(&qp->tterm, literal);
+               }
            }
            DEBUG(2, ("SANITY CHECK FINISHED"));
        }
            }
            DEBUG(2, ("SANITY CHECK FINISHED"));
        }
@@ -424,6 +502,13 @@ _nc_resolve_uses(bool fullresolve)
     return (TRUE);
 }
 
     return (TRUE);
 }
 
+/* obsolete: 20040705 */
+NCURSES_EXPORT(int)
+_nc_resolve_uses(bool fullresolve)
+{
+    return _nc_resolve_uses2(fullresolve, FALSE);
+}
+
 /*
  * This bit of legerdemain turns all the terminfo variable names into
  * references to locations in the arrays Booleans, Numbers, and Strings ---
 /*
  * This bit of legerdemain turns all the terminfo variable names into
  * references to locations in the arrays Booleans, Numbers, and Strings ---
@@ -434,31 +519,50 @@ _nc_resolve_uses(bool fullresolve)
 #define CUR tp->
 
 static void
 #define CUR tp->
 
 static void
-sanity_check(TERMTYPE * tp)
+fixup_acsc(TERMTYPE *tp, int literal)
+{
+    if (!literal) {
+       if (acs_chars == 0
+           && enter_alt_charset_mode != 0
+           && exit_alt_charset_mode != 0)
+           acs_chars = strdup(VT_ACSC);
+    }
+}
+
+static void
+sanity_check2(TERMTYPE *tp, bool literal)
 {
     if (!PRESENT(exit_attribute_mode)) {
 #ifdef __UNUSED__              /* this casts too wide a net */
        bool terminal_entry = !strchr(tp->term_names, '+');
        if (terminal_entry &&
            (PRESENT(set_attributes)
 {
     if (!PRESENT(exit_attribute_mode)) {
 #ifdef __UNUSED__              /* this casts too wide a net */
        bool terminal_entry = !strchr(tp->term_names, '+');
        if (terminal_entry &&
            (PRESENT(set_attributes)
-               || PRESENT(enter_standout_mode)
-               || PRESENT(enter_underline_mode)
-               || PRESENT(enter_blink_mode)
-               || PRESENT(enter_bold_mode)
-               || PRESENT(enter_dim_mode)
-               || PRESENT(enter_secure_mode)
-               || PRESENT(enter_protected_mode)
-               || PRESENT(enter_reverse_mode)))
+            || PRESENT(enter_standout_mode)
+            || PRESENT(enter_underline_mode)
+            || PRESENT(enter_blink_mode)
+            || PRESENT(enter_bold_mode)
+            || PRESENT(enter_dim_mode)
+            || PRESENT(enter_secure_mode)
+            || PRESENT(enter_protected_mode)
+            || PRESENT(enter_reverse_mode)))
            _nc_warning("no exit_attribute_mode");
 #endif /* __UNUSED__ */
            _nc_warning("no exit_attribute_mode");
 #endif /* __UNUSED__ */
-       PAIRED(enter_standout_mode, exit_standout_mode)
-           PAIRED(enter_underline_mode, exit_underline_mode)
+       PAIRED(enter_standout_mode, exit_standout_mode);
+       PAIRED(enter_underline_mode, exit_underline_mode);
+       PAIRED(enter_italics_mode, exit_italics_mode);
+    }
+
+    /* we do this check/fix in postprocess_termcap(), but some packagers
+     * prefer to bypass it...
+     */
+    if (!literal) {
+       fixup_acsc(tp, literal);
+       ANDMISSING(enter_alt_charset_mode, acs_chars);
+       ANDMISSING(exit_alt_charset_mode, acs_chars);
     }
 
     /* listed in structure-member order of first argument */
     PAIRED(enter_alt_charset_mode, exit_alt_charset_mode);
     }
 
     /* listed in structure-member order of first argument */
     PAIRED(enter_alt_charset_mode, exit_alt_charset_mode);
-    ANDMISSING(enter_alt_charset_mode, acs_chars);
-    ANDMISSING(exit_alt_charset_mode, acs_chars);
     ANDMISSING(enter_blink_mode, exit_attribute_mode);
     ANDMISSING(enter_bold_mode, exit_attribute_mode);
     PAIRED(exit_ca_mode, enter_ca_mode);
     ANDMISSING(enter_blink_mode, exit_attribute_mode);
     ANDMISSING(enter_bold_mode, exit_attribute_mode);
     PAIRED(exit_ca_mode, enter_ca_mode);
@@ -476,6 +580,37 @@ sanity_check(TERMTYPE * tp)
     PAIRED(enter_xon_mode, exit_xon_mode);
     PAIRED(enter_am_mode, exit_am_mode);
     ANDMISSING(label_off, label_on);
     PAIRED(enter_xon_mode, exit_xon_mode);
     PAIRED(enter_am_mode, exit_am_mode);
     ANDMISSING(label_off, label_on);
+#ifdef remove_clock
     PAIRED(display_clock, remove_clock);
     PAIRED(display_clock, remove_clock);
+#endif
     ANDMISSING(set_color_pair, initialize_pair);
 }
     ANDMISSING(set_color_pair, initialize_pair);
 }
+
+/* obsolete: 20040705 */
+static void
+sanity_check(TERMTYPE *tp)
+{
+    sanity_check2(tp, FALSE);
+}
+
+#if NO_LEAKS
+NCURSES_EXPORT(void)
+_nc_leaks_tic(void)
+{
+    _nc_alloc_entry_leaks();
+    _nc_captoinfo_leaks();
+    _nc_comp_scan_leaks();
+#if BROKEN_LINKER || USE_REENTRANT
+    _nc_names_leaks();
+    _nc_codes_leaks();
+#endif
+    _nc_tic_expand(0, FALSE, 0);
+}
+
+NCURSES_EXPORT(void)
+_nc_free_tic(int code)
+{
+    _nc_leaks_tic();
+    _nc_free_tinfo(code);
+}
+#endif