ncurses 5.3

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

diff --git a/ncurses/tinfo/comp_parse.c b/ncurses/tinfo/comp_parse.c
index ca58bb5746e76ebed0c670789a84f097c50d175c..a5dc70ce180282b4eb41a8109c8de70508ad567c 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-2001,2002 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            *


@@ -52,10 +52,10 @@
 #include <tic.h>
 #include <term_entry.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.53 2002/09/07 20:01:28 tom Exp $")

 
 static void sanity_check(TERMTYPE *);
 
 static void sanity_check(TERMTYPE *);

-void (*_nc_check_termtype) (TERMTYPE *) = sanity_check;
+NCURSES_IMPEXP void NCURSES_API(*_nc_check_termtype) (TERMTYPE *) = sanity_check;

 
 /****************************************************************************
  *
 
 /****************************************************************************
  *


@@ -78,7 +78,8 @@ void (*_nc_check_termtype) (TERMTYPE *) = sanity_check;
  *        _nc_head                _nc_tail
  */
 
  *        _nc_head                _nc_tail
  */
 

-ENTRY *_nc_head = 0, *_nc_tail = 0;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_head = 0;
+NCURSES_EXPORT_VAR(ENTRY *) _nc_tail = 0;

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


@@ -87,7 +88,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,7 +98,7 @@ enqueue(ENTRY * ep)
        newp->last->next = newp;
 }
 
        newp->last->next = newp;
 }
 

-void
+NCURSES_EXPORT(void)

 _nc_free_entries(ENTRY * headp)
 /* free the allocated storage consumed by list entries */
 {
 _nc_free_entries(ENTRY * headp)
 /* free the allocated storage consumed by list entries */
 {


@@ -122,26 +123,29 @@ _nc_free_entries(ENTRY * headp)
     }
 }
 
     }
 }
 

-bool
+static char *
+force_bar(char *dst, char *src)
+{
+    if (strchr(src, '|') == 0) {
+       size_t len = strlen(src);
+       if (len > MAX_NAME_SIZE)
+           len = MAX_NAME_SIZE;
+       (void) strncpy(dst, src, len);
+       (void) strcpy(dst + len, "|");
+       src = dst;
+    }
+    return src;
+}
+
+NCURSES_EXPORT(bool)

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

-    char nc1[MAX_NAME_SIZE + 1], nc2[MAX_NAME_SIZE + 1];
+    char nc1[MAX_NAME_SIZE + 2], nc2[MAX_NAME_SIZE + 2];

 
 

-    if (strchr(n1, '|') == 0) {
-       (void) strncpy(nc1, n1, sizeof(nc1) - 2);
-       nc1[sizeof(nc1) - 2] = '\0';
-       (void) strcat(nc1, "|");
-       n1 = nc1;
-    }
-
-    if (strchr(n2, '|') == 0) {
-       (void) strncpy(nc2, n2, sizeof(nc2) - 2);
-       nc2[sizeof(nc2) - 2] = '\0';
-       (void) strcat(nc2, "|");
-       n2 = nc2;
-    }
+    n1 = force_bar(nc1, n1);
+    n2 = force_bar(nc2, n2);

 
     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)


@@ -158,10 +162,10 @@ _nc_entry_match(char *n1, char *n2)
  *
  ****************************************************************************/
 
  *
  ****************************************************************************/
 

-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 *))
+                     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,7 +180,7 @@ _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");
 
        /*


@@ -206,7 +210,7 @@ _nc_read_entry_source(FILE * fp, char *buf,
     _nc_suppress_warnings = oldsuppress;
 }
 
     _nc_suppress_warnings = oldsuppress;
 }
 

-int
+NCURSES_EXPORT(int)

 _nc_resolve_uses(bool fullresolve)
 /* try to resolve all use capabilities */
 {
 _nc_resolve_uses(bool fullresolve)
 /* try to resolve all use capabilities */
 {


@@ -223,17 +227,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);


@@ -261,14 +266,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 +285,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;


@@ -314,8 +320,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 +333,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,7 +342,7 @@ _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;
                        }
 


@@ -354,7 +360,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.


@@ -368,6 +374,7 @@ _nc_resolve_uses(bool fullresolve)
                    FreeIfNeeded(qp->tterm.Numbers);
                    FreeIfNeeded(qp->tterm.Strings);
                    qp->tterm = merged;
                    FreeIfNeeded(qp->tterm.Numbers);
                    FreeIfNeeded(qp->tterm.Strings);
                    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


@@ -389,15 +396,18 @@ _nc_resolve_uses(bool fullresolve)
         * entry there should be no cancellation markers.
         */
        for_entry_list(qp) {
         * 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))
+           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)
                if (qp->tterm.Numbers[j] == CANCELLED_NUMERIC)

-               qp->tterm.Numbers[j] = ABSENT_NUMERIC;
-           for_each_string(j, &(qp->tterm))
+                   qp->tterm.Numbers[j] = ABSENT_NUMERIC;
+           }
+           for_each_string(j, &(qp->tterm)) {

                if (qp->tterm.Strings[j] == CANCELLED_STRING)
                if (qp->tterm.Strings[j] == CANCELLED_STRING)

-               qp->tterm.Strings[j] = ABSENT_STRING;
+                   qp->tterm.Strings[j] = ABSENT_STRING;
+           }

        }
     }
 
        }
     }
 


@@ -441,20 +451,28 @@ sanity_check(TERMTYPE * tp)
        bool terminal_entry = !strchr(tp->term_names, '+');
        if (terminal_entry &&
            (PRESENT(set_attributes)
        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 (acs_chars == 0
+       && enter_alt_charset_mode != 0
+       && exit_alt_charset_mode != 0)
+       acs_chars = strdup(VT_ACSC);
+

     /* listed in structure-member order of first argument */
     PAIRED(enter_alt_charset_mode, exit_alt_charset_mode);
     ANDMISSING(enter_alt_charset_mode, acs_chars);
     /* listed in structure-member order of first argument */
     PAIRED(enter_alt_charset_mode, exit_alt_charset_mode);
     ANDMISSING(enter_alt_charset_mode, acs_chars);


@@ -476,6 +494,8 @@ 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);
 }