ncurses 5.9 - patch 20120128

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index a5dc70ce180282b4eb41a8109c8de70508ad567c..48bd97a8923cd9c1d1d347ac2aa8adba3415dd2b 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2001,2002 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2011,2012 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            *


@@ -29,20 +29,16 @@
 /****************************************************************************
  *  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>


@@ -50,36 +46,17 @@
 #include <ctype.h>
 
 #include <tic.h>
 #include <ctype.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: comp_parse.c,v 1.53 2002/09/07 20:01:28 tom Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.79 2012/01/28 21:49:23 tom Exp $")

 
 

+static void sanity_check2(TERMTYPE *, bool);
+NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype2) (TERMTYPE *, bool) = sanity_check2;
+
+/* obsolete: 20040705 */

 static void sanity_check(TERMTYPE *);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
 
 static void sanity_check(TERMTYPE *);
 NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;
 

-/****************************************************************************
- *
- * 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
- */
-
-NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
-NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;
+static void fixup_acsc(TERMTYPE *, int);

 
 static void
 enqueue(ENTRY * ep)
 
 static void
 enqueue(ENTRY * ep)


@@ -98,31 +75,6 @@ enqueue(ENTRY * ep)
        newp->last->next = newp;
 }
 
        newp->last->next = newp;
 }
 

-NCURSES_EXPORT(void)
-_nc_free_entries(ENTRY * headp)
-/* free the allocated storage consumed by list entries */
-{
-    ENTRY *ep, *next;
-
-    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);
-
-       next = ep->next;
-
-       free(ep);
-       if (ep == _nc_head)
-           _nc_head = 0;
-       if (ep == _nc_tail)
-           _nc_tail = 0;
-    }
-}
-

 static char *
 force_bar(char *dst, char *src)
 {
 static char *
 force_bar(char *dst, char *src)
 {


@@ -136,26 +88,123 @@ force_bar(char *dst, char *src)
     }
     return src;
 }
     }
     return src;
 }

+#define ForceBar(dst, src) ((strchr(src, '|') == 0) ? force_bar(dst, src) : src)

 
 

-NCURSES_EXPORT(bool)
-_nc_entry_match(char *n1, char *n2)
-/* do any of the aliases in a pair of terminal names match? */
+#if USE_TERMCAP && NCURSES_XNAMES
+static char *
+skip_index(char *name)
+{
+    char *bar = strchr(name, '|');
+
+    if (bar != 0 && (bar - name) == 2)
+       name = bar + 1;
+
+    return name;
+}
+#endif
+
+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 + 2], nc2[MAX_NAME_SIZE + 2];
+    char nc1[MAX_NAME_SIZE + 2];
+    char nc2[MAX_NAME_SIZE + 2];

 
 

-    n1 = force_bar(nc1, n1);
-    n2 = force_bar(nc2, n2);
+    n1 = ForceBar(nc1, n1);
+    n2 = ForceBar(nc2, n2);
+
+#if 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 *p1 = n1;
+    char *p2 = n2;
+    char *pstart, *qstart, *pend, *qend;
+    bool removed = FALSE;
+
+#if USE_TERMCAP && NCURSES_XNAMES
+    if ((_nc_syntax == SYN_TERMCAP) && _nc_user_definable) {
+       p1 = n1 = skip_index(n1);
+       p2 = n2 = skip_index(n2);
+    }
+#else
+    (void) p1;
+#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


@@ -163,7 +212,7 @@ _nc_entry_match(char *n1, char *n2)
  ****************************************************************************/
 
 NCURSES_EXPORT(void)
  ****************************************************************************/
 
 NCURSES_EXPORT(void)

-_nc_read_entry_source(FILE * fp, char *buf,
+_nc_read_entry_source(FILE *fp, char *buf,

                      int literal, bool silent,
                      bool(*hook) (ENTRY *))
 /* slurp all entries in the given file into core */
                      int literal, bool silent,
                      bool(*hook) (ENTRY *))
 /* slurp all entries in the given file into core */


@@ -184,14 +233,25 @@ _nc_read_entry_source(FILE * fp, char *buf,
            _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) {


@@ -211,12 +271,13 @@ _nc_read_entry_source(FILE * fp, char *buf,
 }
 
 NCURSES_EXPORT(int)
 }
 
 NCURSES_EXPORT(int)

-_nc_resolve_uses(bool fullresolve)
+_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"));
 


@@ -229,19 +290,19 @@ _nc_resolve_uses(bool fullresolve)
 
        for_entry_list(rp) {
            if (qp > rp
 
        for_entry_list(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);


@@ -305,7 +366,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;
            }


@@ -347,10 +408,10 @@ _nc_resolve_uses(bool fullresolve)
                        }
 
                    /*
                        }
 
                    /*

-                      * 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));
 


@@ -373,6 +434,9 @@ _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;
                    _nc_wrap_entry(qp, TRUE);
 
                    qp->tterm = merged;
                    _nc_wrap_entry(qp, TRUE);
 


@@ -389,26 +453,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 ((int) 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;
-           }
-       }

     }
 
     /*
     }
 
     /*


@@ -424,9 +468,17 @@ _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) {
+                   _nc_check_termtype2(&qp->tterm, literal);
+               } else {
+                   fixup_acsc(&qp->tterm, literal);
+               }

            }
            DEBUG(2, ("SANITY CHECK FINISHED"));
        }
            }
            DEBUG(2, ("SANITY CHECK FINISHED"));
        }


@@ -434,6 +486,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 ---


@@ -444,7 +503,18 @@ _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 */
 {
     if (!PRESENT(exit_attribute_mode)) {
 #ifdef __UNUSED__              /* this casts too wide a net */


@@ -468,15 +538,14 @@ sanity_check(TERMTYPE * tp)
     /* we do this check/fix in postprocess_termcap(), but some packagers
      * prefer to bypass it...
      */
     /* we do this check/fix in postprocess_termcap(), but some packagers
      * prefer to bypass it...
      */

-    if (acs_chars == 0
-       && enter_alt_charset_mode != 0
-       && exit_alt_charset_mode != 0)
-       acs_chars = strdup(VT_ACSC);
+    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);


@@ -499,3 +568,32 @@ sanity_check(TERMTYPE * tp)
 #endif
     ANDMISSING(set_color_pair, initialize_pair);
 }
 #endif
     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