ncurses 5.6 - patch 20080927

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index ecb2f5834d834d77b9d44217af736a08c2253eed..3325a0ddae6c7e4660fe9e5a4f83430cdd307bbe 100644 (file)
--- a/ncurses/tinfo/comp_parse.c
+++ b/ncurses/tinfo/comp_parse.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998,1999,2000 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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,18 +29,19 @@
 /****************************************************************************
  *  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.
  *
  *     _nc_read_entry_source(FILE *, literal, bool, bool (*hook)())
  ****************************************************************************/
 
 /*
  *     comp_parse.c -- parser driver loop and use handling.
  *
  *     _nc_read_entry_source(FILE *, literal, bool, bool (*hook)())

- *     _nc_resolve_uses(void)
+ *     _nc_resolve_uses2(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
  *     _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

- *     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().
  *
  */


@@ -52,33 +53,14 @@
 #include <tic.h>
 #include <term_entry.h>
 
 #include <tic.h>
 #include <term_entry.h>
 

-MODULE_ID("$Id: comp_parse.c,v 1.42 2000/10/14 17:50:45 Bernhard.Rosenkraenzer Exp $")
+MODULE_ID("$Id: comp_parse.c,v 1.69 2008/08/16 21:58:16 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
- */
-
-ENTRY *_nc_head = 0, *_nc_tail = 0;
+/* obsolete: 20040705 */
+static void sanity_check(TERMTYPE *);
+NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;

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


@@ -87,7 +69,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,31 +79,6 @@ 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 */
-{
-    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,7 +93,7 @@ force_bar(char *dst, char *src)
     return src;
 }
 
     return src;
 }
 

-bool
+NCURSES_EXPORT(bool)

 _nc_entry_match(char *n1, char *n2)
 /* do any of the aliases in a pair of terminal names match? */
 {
 _nc_entry_match(char *n1, char *n2)
 /* do any of the aliases in a pair of terminal names match? */
 {


@@ -161,10 +118,10 @@ _nc_entry_match(char *n1, char *n2)
  *
  ****************************************************************************/
 
  *
  ****************************************************************************/
 

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


@@ -179,18 +136,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) {


@@ -209,13 +177,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"));
 


@@ -226,17 +195,18 @@ _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++;
+               && _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++;
+               }
+               if (matchcount >= 1)
+                   (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names));

            }
            }

-           if (matchcount >= 1)
-               (void) fprintf(stderr, " %s", _nc_first_name(rp->tterm.term_names));

        }
        if (matchcount >= 1)
            (void) putc('\n', stderr);
        }
        if (matchcount >= 1)
            (void) putc('\n', stderr);


@@ -264,14 +234,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 */


@@ -282,11 +253,11 @@ _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)
 
                    rp = typeMalloc(ENTRY, 1);
                    if (rp == 0)

-                       _nc_err_abort("Out of memory");
+                       _nc_err_abort(MSG_NO_MEMORY);

                    rp->tterm = thisterm;
                    rp->nuses = 0;
                    rp->next = lastread;
                    rp->tterm = thisterm;
                    rp->nuses = 0;
                    rp->next = lastread;


@@ -317,8 +288,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) {


@@ -330,7 +301,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


@@ -339,15 +310,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));
 


@@ -357,7 +328,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.


@@ -370,7 +341,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


@@ -385,23 +360,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;
-       }

     }
 
     /*
     }
 
     /*


@@ -419,7 +377,7 @@ _nc_resolve_uses(bool fullresolve)
            for_entry_list(qp) {
                _nc_curr_line = qp->startline;
                _nc_set_type(_nc_first_name(qp->tterm.term_names));
            for_entry_list(qp) {
                _nc_curr_line = qp->startline;
                _nc_set_type(_nc_first_name(qp->tterm.term_names));

-               _nc_check_termtype(&qp->tterm);
+               _nc_check_termtype2(&qp->tterm, literal);

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


@@ -427,6 +385,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 ---


@@ -437,31 +402,41 @@ _nc_resolve_uses(bool fullresolve)
 #define CUR tp->
 
 static void
 #define CUR tp->
 
 static void

-sanity_check(TERMTYPE * tp)
+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);
+    }
+
+    /* we do this check/fix in postprocess_termcap(), but some packagers
+     * prefer to bypass it...
+     */
+    if (!literal) {
+       if (acs_chars == 0
+           && enter_alt_charset_mode != 0
+           && exit_alt_charset_mode != 0)
+           acs_chars = strdup(VT_ACSC);
+       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);


@@ -479,6 +454,38 @@ 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_captab_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