ncurses 5.9 - patch 20130831

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

diff --git a/ncurses/tinfo/alloc_ttype.c b/ncurses/tinfo/alloc_ttype.c
index 9f31ed3ffab75b6712727847b9058534df257c84..35c92dd8c2b911696b028ed7894a6c338095a4f4 100644 (file)
--- a/ncurses/tinfo/alloc_ttype.c
+++ b/ncurses/tinfo/alloc_ttype.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1999-2003,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1999-2012,2013 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            *


@@ -41,9 +41,8 @@
 #include <curses.priv.h>
 
 #include <tic.h>
 #include <curses.priv.h>
 
 #include <tic.h>

-#include <term_entry.h>

 
 

-MODULE_ID("$Id: alloc_ttype.c,v 1.16 2006/07/08 19:18:38 tom Exp $")
+MODULE_ID("$Id: alloc_ttype.c,v 1.27 2013/06/08 16:54:50 tom Exp $")

 
 #if NCURSES_XNAMES
 /*
 
 #if NCURSES_XNAMES
 /*


@@ -91,6 +90,9 @@ find_name(char **table, int length, char *name)
     return FALSE;
 }
 
     return FALSE;
 }
 

+#define EXTEND_NUM(num, ext) \
+       to->num = (unsigned short) (to->num + (ext - to->ext))
+

 static void
 realign_data(TERMTYPE *to, char **ext_Names,
             int ext_Booleans,
 static void
 realign_data(TERMTYPE *to, char **ext_Names,
             int ext_Booleans,


@@ -101,8 +103,8 @@ realign_data(TERMTYPE *to, char **ext_Names,
     int limit = (to->ext_Booleans + to->ext_Numbers + to->ext_Strings);
 
     if (to->ext_Booleans != ext_Booleans) {
     int limit = (to->ext_Booleans + to->ext_Numbers + to->ext_Strings);
 
     if (to->ext_Booleans != ext_Booleans) {

-       to->num_Booleans += (ext_Booleans - to->ext_Booleans);
-       to->Booleans = typeRealloc(NCURSES_SBOOL, to->num_Booleans, to->Booleans);
+       EXTEND_NUM(num_Booleans, ext_Booleans);
+       TYPE_REALLOC(NCURSES_SBOOL, to->num_Booleans, to->Booleans);

        for (n = to->ext_Booleans - 1,
             m = ext_Booleans - 1,
             base = to->num_Booleans - (m + 1); m >= 0; m--) {
        for (n = to->ext_Booleans - 1,
             m = ext_Booleans - 1,
             base = to->num_Booleans - (m + 1); m >= 0; m--) {


@@ -112,11 +114,12 @@ realign_data(TERMTYPE *to, char **ext_Names,
                to->Booleans[base + m] = FALSE;
            }
        }
                to->Booleans[base + m] = FALSE;
            }
        }

-       to->ext_Booleans = ext_Booleans;
+       to->ext_Booleans = UShort(ext_Booleans);

     }
     }

+

     if (to->ext_Numbers != ext_Numbers) {
     if (to->ext_Numbers != ext_Numbers) {

-       to->num_Numbers += (ext_Numbers - to->ext_Numbers);
-       to->Numbers = typeRealloc(short, to->num_Numbers, to->Numbers);
+       EXTEND_NUM(num_Numbers, ext_Numbers);
+       TYPE_REALLOC(short, to->num_Numbers, to->Numbers);

        for (n = to->ext_Numbers - 1,
             m = ext_Numbers - 1,
             base = to->num_Numbers - (m + 1); m >= 0; m--) {
        for (n = to->ext_Numbers - 1,
             m = ext_Numbers - 1,
             base = to->num_Numbers - (m + 1); m >= 0; m--) {


@@ -126,11 +129,11 @@ realign_data(TERMTYPE *to, char **ext_Names,
                to->Numbers[base + m] = ABSENT_NUMERIC;
            }
        }
                to->Numbers[base + m] = ABSENT_NUMERIC;
            }
        }

-       to->ext_Numbers = ext_Numbers;
+       to->ext_Numbers = UShort(ext_Numbers);

     }
     if (to->ext_Strings != ext_Strings) {
     }
     if (to->ext_Strings != ext_Strings) {

-       to->num_Strings += (ext_Strings - to->ext_Strings);
-       to->Strings = typeRealloc(char *, to->num_Strings, to->Strings);
+       EXTEND_NUM(num_Strings, ext_Strings);
+       TYPE_REALLOC(char *, to->num_Strings, to->Strings);

        for (n = to->ext_Strings - 1,
             m = ext_Strings - 1,
             base = to->num_Strings - (m + 1); m >= 0; m--) {
        for (n = to->ext_Strings - 1,
             m = ext_Strings - 1,
             base = to->num_Strings - (m + 1); m >= 0; m--) {


@@ -140,17 +143,17 @@ realign_data(TERMTYPE *to, char **ext_Names,
                to->Strings[base + m] = ABSENT_STRING;
            }
        }
                to->Strings[base + m] = ABSENT_STRING;
            }
        }

-       to->ext_Strings = ext_Strings;
+       to->ext_Strings = UShort(ext_Strings);

     }
 }
 
 /*
  * Returns the first index in ext_Names[] for the given token-type
  */
     }
 }
 
 /*
  * Returns the first index in ext_Names[] for the given token-type
  */

-static int
+static unsigned

 _nc_first_ext_name(TERMTYPE *tp, int token_type)
 {
 _nc_first_ext_name(TERMTYPE *tp, int token_type)
 {

-    int first;
+    unsigned first;

 
     switch (token_type) {
     case BOOLEAN:
 
     switch (token_type) {
     case BOOLEAN:


@@ -160,7 +163,7 @@ _nc_first_ext_name(TERMTYPE *tp, int token_type)
        first = tp->ext_Booleans;
        break;
     case STRING:
        first = tp->ext_Booleans;
        break;
     case STRING:

-       first = tp->ext_Booleans + tp->ext_Numbers;
+       first = (unsigned) (tp->ext_Booleans + tp->ext_Numbers);

        break;
     default:
        first = 0;
        break;
     default:
        first = 0;


@@ -172,17 +175,17 @@ _nc_first_ext_name(TERMTYPE *tp, int token_type)
 /*
  * Returns the last index in ext_Names[] for the given token-type
  */
 /*
  * Returns the last index in ext_Names[] for the given token-type
  */

-static int
+static unsigned

 _nc_last_ext_name(TERMTYPE *tp, int token_type)
 {
 _nc_last_ext_name(TERMTYPE *tp, int token_type)
 {

-    int last;
+    unsigned last;

 
     switch (token_type) {
     case BOOLEAN:
        last = tp->ext_Booleans;
        break;
     case NUMBER:
 
     switch (token_type) {
     case BOOLEAN:
        last = tp->ext_Booleans;
        break;
     case NUMBER:

-       last = tp->ext_Booleans + tp->ext_Numbers;
+       last = (unsigned) (tp->ext_Booleans + tp->ext_Numbers);

        break;
     default:
     case STRING:
        break;
     default:
     case STRING:


@@ -204,7 +207,7 @@ _nc_find_ext_name(TERMTYPE *tp, char *name, int token_type)
 
     for (j = first; j < last; j++) {
        if (!strcmp(name, tp->ext_Names[j])) {
 
     for (j = first; j < last; j++) {
        if (!strcmp(name, tp->ext_Names[j])) {

-           return j;
+           return (int) j;

        }
     }
     return -1;
        }
     }
     return -1;


@@ -244,7 +247,7 @@ _nc_del_ext_name(TERMTYPE *tp, char *name, int token_type)
     int first, last;
 
     if ((first = _nc_find_ext_name(tp, name, token_type)) >= 0) {
     int first, last;
 
     if ((first = _nc_find_ext_name(tp, name, token_type)) >= 0) {

-       last = NUM_EXT_NAMES(tp) - 1;
+       last = (int) NUM_EXT_NAMES(tp) - 1;

        for (j = first; j < last; j++) {
            tp->ext_Names[j] = tp->ext_Names[j + 1];
        }
        for (j = first; j < last; j++) {
            tp->ext_Names[j] = tp->ext_Names[j + 1];
        }


@@ -254,22 +257,22 @@ _nc_del_ext_name(TERMTYPE *tp, char *name, int token_type)
            last = tp->num_Booleans - 1;
            for (j = first; j < last; j++)
                tp->Booleans[j] = tp->Booleans[j + 1];
            last = tp->num_Booleans - 1;
            for (j = first; j < last; j++)
                tp->Booleans[j] = tp->Booleans[j + 1];

-           tp->ext_Booleans -= 1;
-           tp->num_Booleans -= 1;
+           tp->ext_Booleans--;
+           tp->num_Booleans--;

            break;
        case NUMBER:
            last = tp->num_Numbers - 1;
            for (j = first; j < last; j++)
                tp->Numbers[j] = tp->Numbers[j + 1];
            break;
        case NUMBER:
            last = tp->num_Numbers - 1;
            for (j = first; j < last; j++)
                tp->Numbers[j] = tp->Numbers[j + 1];

-           tp->ext_Numbers -= 1;
-           tp->num_Numbers -= 1;
+           tp->ext_Numbers--;
+           tp->num_Numbers--;

            break;
        case STRING:
            last = tp->num_Strings - 1;
            for (j = first; j < last; j++)
                tp->Strings[j] = tp->Strings[j + 1];
            break;
        case STRING:
            last = tp->num_Strings - 1;
            for (j = first; j < last; j++)
                tp->Strings[j] = tp->Strings[j + 1];

-           tp->ext_Strings -= 1;
-           tp->num_Strings -= 1;
+           tp->ext_Strings--;
+           tp->num_Strings--;

            break;
        }
        return TRUE;
            break;
        }
        return TRUE;


@@ -299,36 +302,36 @@ _nc_ins_ext_name(TERMTYPE *tp, char *name, int token_type)
        }
     }
 
        }
     }
 

-    tp->ext_Names = typeRealloc(char *, total, tp->ext_Names);
+    TYPE_REALLOC(char *, total, tp->ext_Names);

     for (k = total - 1; k > j; k--)
        tp->ext_Names[k] = tp->ext_Names[k - 1];
     tp->ext_Names[j] = name;
     for (k = total - 1; k > j; k--)
        tp->ext_Names[k] = tp->ext_Names[k - 1];
     tp->ext_Names[j] = name;

-    j = _nc_ext_data_index(tp, (int) j, token_type);
+    j = (unsigned) _nc_ext_data_index(tp, (int) j, token_type);

 
     switch (token_type) {
     case BOOLEAN:
 
     switch (token_type) {
     case BOOLEAN:

-       tp->ext_Booleans += 1;
-       tp->num_Booleans += 1;
-       tp->Booleans = typeRealloc(NCURSES_SBOOL, tp->num_Booleans, tp->Booleans);
-       for (k = tp->num_Booleans - 1; k > j; k--)
+       tp->ext_Booleans++;
+       tp->num_Booleans++;
+       TYPE_REALLOC(NCURSES_SBOOL, tp->num_Booleans, tp->Booleans);
+       for (k = (unsigned) (tp->num_Booleans - 1); k > j; k--)

            tp->Booleans[k] = tp->Booleans[k - 1];
        break;
     case NUMBER:
            tp->Booleans[k] = tp->Booleans[k - 1];
        break;
     case NUMBER:

-       tp->ext_Numbers += 1;
-       tp->num_Numbers += 1;
-       tp->Numbers = typeRealloc(short, tp->num_Numbers, tp->Numbers);
-       for (k = tp->num_Numbers - 1; k > j; k--)
+       tp->ext_Numbers++;
+       tp->num_Numbers++;
+       TYPE_REALLOC(short, tp->num_Numbers, tp->Numbers);
+       for (k = (unsigned) (tp->num_Numbers - 1); k > j; k--)

            tp->Numbers[k] = tp->Numbers[k - 1];
        break;
     case STRING:
            tp->Numbers[k] = tp->Numbers[k - 1];
        break;
     case STRING:

-       tp->ext_Strings += 1;
-       tp->num_Strings += 1;
-       tp->Strings = typeRealloc(char *, tp->num_Strings, tp->Strings);
-       for (k = tp->num_Strings - 1; k > j; k--)
+       tp->ext_Strings++;
+       tp->num_Strings++;
+       TYPE_REALLOC(char *, tp->num_Strings, tp->Strings);
+       for (k = (unsigned) (tp->num_Strings - 1); k > j; k--)

            tp->Strings[k] = tp->Strings[k - 1];
        break;
     }
            tp->Strings[k] = tp->Strings[k - 1];
        break;
     }

-    return j;
+    return (int) j;

 }
 
 /*
 }
 
 /*


@@ -345,10 +348,10 @@ adjust_cancels(TERMTYPE *to, TERMTYPE *from)
 
     for (j = first; j < last;) {
        char *name = to->ext_Names[j];
 
     for (j = first; j < last;) {
        char *name = to->ext_Names[j];

-       unsigned j_str = to->num_Strings - first - to->ext_Strings;
+       int j_str = to->num_Strings - first - to->ext_Strings;

 
        if (to->Strings[j + j_str] == CANCELLED_STRING) {
 
        if (to->Strings[j + j_str] == CANCELLED_STRING) {

-           if ((k = _nc_find_ext_name(from, to->ext_Names[j], BOOLEAN)) >= 0) {
+           if (_nc_find_ext_name(from, to->ext_Names[j], BOOLEAN) >= 0) {

                if (_nc_del_ext_name(to, name, STRING)
                    || _nc_del_ext_name(to, name, NUMBER)) {
                    k = _nc_ins_ext_name(to, name, BOOLEAN);
                if (_nc_del_ext_name(to, name, STRING)
                    || _nc_del_ext_name(to, name, NUMBER)) {
                    k = _nc_ins_ext_name(to, name, BOOLEAN);


@@ -356,8 +359,7 @@ adjust_cancels(TERMTYPE *to, TERMTYPE *from)
                } else {
                    j++;
                }
                } else {
                    j++;
                }

-           } else if ((k = _nc_find_ext_name(from, to->ext_Names[j],
-                                             NUMBER)) >= 0) {
+           } else if (_nc_find_ext_name(from, to->ext_Names[j], NUMBER) >= 0) {

                if (_nc_del_ext_name(to, name, STRING)
                    || _nc_del_ext_name(to, name, BOOLEAN)) {
                    k = _nc_ins_ext_name(to, name, NUMBER);
                if (_nc_del_ext_name(to, name, STRING)
                    || _nc_del_ext_name(to, name, BOOLEAN)) {
                    k = _nc_ins_ext_name(to, name, NUMBER);


@@ -365,6 +367,16 @@ adjust_cancels(TERMTYPE *to, TERMTYPE *from)
                } else {
                    j++;
                }
                } else {
                    j++;
                }

+           } else if (_nc_find_ext_name(from, to->ext_Names[j], STRING) >= 0) {
+               if (_nc_del_ext_name(to, name, NUMBER)
+                   || _nc_del_ext_name(to, name, BOOLEAN)) {
+                   k = _nc_ins_ext_name(to, name, STRING);
+                   to->Strings[k] = CANCELLED_STRING;
+               } else {
+                   j++;
+               }
+           } else {
+               j++;

            }
        } else {
            j++;
            }
        } else {
            j++;


@@ -375,8 +387,8 @@ adjust_cancels(TERMTYPE *to, TERMTYPE *from)
 NCURSES_EXPORT(void)
 _nc_align_termtype(TERMTYPE *to, TERMTYPE *from)
 {
 NCURSES_EXPORT(void)
 _nc_align_termtype(TERMTYPE *to, TERMTYPE *from)
 {

-    int na = NUM_EXT_NAMES(to);
-    int nb = NUM_EXT_NAMES(from);
+    int na = (int) NUM_EXT_NAMES(to);
+    int nb = (int) NUM_EXT_NAMES(from);

     int n;
     bool same;
     char **ext_Names;
     int n;
     bool same;
     char **ext_Names;


@@ -406,7 +418,7 @@ _nc_align_termtype(TERMTYPE *to, TERMTYPE *from)
         * into it, updating to's counts for booleans, etc.  Fortunately we do
         * this only for the terminfo compiler (tic) and comparer (infocmp).
         */
         * into it, updating to's counts for booleans, etc.  Fortunately we do
         * this only for the terminfo compiler (tic) and comparer (infocmp).
         */

-       ext_Names = typeMalloc(char *, na + nb);
+       TYPE_MALLOC(char *, (size_t)(na + nb), ext_Names);

 
        if (to->ext_Strings && (from->ext_Booleans + from->ext_Numbers))
            adjust_cancels(to, from);
 
        if (to->ext_Strings && (from->ext_Booleans + from->ext_Numbers))
            adjust_cancels(to, from);


@@ -450,8 +462,8 @@ _nc_align_termtype(TERMTYPE *to, TERMTYPE *from)
        if (nb != (ext_Booleans + ext_Numbers + ext_Strings)) {
            nb = (ext_Booleans + ext_Numbers + ext_Strings);
            realign_data(from, ext_Names, ext_Booleans, ext_Numbers, ext_Strings);
        if (nb != (ext_Booleans + ext_Numbers + ext_Strings)) {
            nb = (ext_Booleans + ext_Numbers + ext_Strings);
            realign_data(from, ext_Names, ext_Booleans, ext_Numbers, ext_Strings);

-           from->ext_Names = typeRealloc(char *, nb, from->ext_Names);
-           memcpy(from->ext_Names, ext_Names, sizeof(char *) * nb);
+           TYPE_REALLOC(char *, (size_t) nb, from->ext_Names);
+           memcpy(from->ext_Names, ext_Names, sizeof(char *) * (size_t) nb);

            DEBUG(2, ("realigned %d extended names for '%s' (from)",
                      NUM_EXT_NAMES(from), from->term_names));
        }
            DEBUG(2, ("realigned %d extended names for '%s' (from)",
                      NUM_EXT_NAMES(from), from->term_names));
        }


@@ -462,22 +474,27 @@ _nc_align_termtype(TERMTYPE *to, TERMTYPE *from)
 #endif
 
 NCURSES_EXPORT(void)
 #endif
 
 NCURSES_EXPORT(void)

-_nc_copy_termtype(TERMTYPE *dst, TERMTYPE *src)
+_nc_copy_termtype(TERMTYPE *dst, const TERMTYPE *src)

 {
 {

+#if NCURSES_XNAMES

     unsigned i;
     unsigned i;

+#endif

 
     *dst = *src;               /* ...to copy the sizes and string-tables */
 
     *dst = *src;               /* ...to copy the sizes and string-tables */

-    dst->Booleans = typeMalloc(NCURSES_SBOOL, NUM_BOOLEANS(dst));
-    dst->Numbers = typeMalloc(short, NUM_NUMBERS(dst));
-    dst->Strings = typeMalloc(char *, NUM_STRINGS(dst));
-
-    /* FIXME: use memcpy for these and similar loops */
-    for_each_boolean(i, dst)
-       dst->Booleans[i] = src->Booleans[i];
-    for_each_number(i, dst)
-       dst->Numbers[i] = src->Numbers[i];
-    for_each_string(i, dst)
-       dst->Strings[i] = src->Strings[i];
+
+    TYPE_MALLOC(NCURSES_SBOOL, NUM_BOOLEANS(dst), dst->Booleans);
+    TYPE_MALLOC(short, NUM_NUMBERS(dst), dst->Numbers);
+    TYPE_MALLOC(char *, NUM_STRINGS(dst), dst->Strings);
+
+    memcpy(dst->Booleans,
+          src->Booleans,
+          NUM_BOOLEANS(dst) * sizeof(dst->Booleans[0]));
+    memcpy(dst->Numbers,
+          src->Numbers,
+          NUM_NUMBERS(dst) * sizeof(dst->Numbers[0]));
+    memcpy(dst->Strings,
+          src->Strings,
+          NUM_STRINGS(dst) * sizeof(dst->Strings[0]));

 
     /* FIXME: we probably should also copy str_table and ext_str_table,
      * but tic and infocmp are not written to exploit that (yet).
 
     /* FIXME: we probably should also copy str_table and ext_str_table,
      * but tic and infocmp are not written to exploit that (yet).


@@ -485,11 +502,10 @@ _nc_copy_termtype(TERMTYPE *dst, TERMTYPE *src)
 
 #if NCURSES_XNAMES
     if ((i = NUM_EXT_NAMES(src)) != 0) {
 
 #if NCURSES_XNAMES
     if ((i = NUM_EXT_NAMES(src)) != 0) {

-       dst->ext_Names = typeMalloc(char *, i);
+       TYPE_MALLOC(char *, i, dst->ext_Names);

        memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *));
     } else {
        dst->ext_Names = 0;
     }
 #endif
        memcpy(dst->ext_Names, src->ext_Names, i * sizeof(char *));
     } else {
        dst->ext_Names = 0;
     }
 #endif

-

 }
 }