ncurses 6.1 - patch 20181215

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

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 88edb0faa61ad46ed76fb01e9a2483cb3a0cc34f..fe7892f4c6184275f806211cec537631213c2a4b 100644 (file)
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

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


@@ -47,7 +47,7 @@
 
 #include <tic.h>
 
 
 #include <tic.h>
 

-MODULE_ID("$Id: alloc_entry.c,v 1.57 2012/10/27 21:32:23 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.62 2018/04/14 20:32:09 tom Exp $")

 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2


@@ -58,11 +58,9 @@ static char *stringbuf;              /* buffer for string capabilities */
 static size_t next_free;       /* next free character in stringbuf */
 
 NCURSES_EXPORT(void)
 static size_t next_free;       /* next free character in stringbuf */
 
 NCURSES_EXPORT(void)

-_nc_init_entry(TERMTYPE *const tp)
+_nc_init_entry(ENTRY * const tp)

 /* initialize a terminal type data block */
 {
 /* initialize a terminal type data block */
 {

-    unsigned i;
-

 #if NO_LEAKS
     if (tp == 0) {
        if (stringbuf != 0) {
 #if NO_LEAKS
     if (tp == 0) {
        if (stringbuf != 0) {


@@ -75,31 +73,9 @@ _nc_init_entry(TERMTYPE *const tp)
     if (stringbuf == 0)
        TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
 
     if (stringbuf == 0)
        TYPE_MALLOC(char, (size_t) MAX_STRTAB, stringbuf);
 

-#if NCURSES_XNAMES
-    tp->num_Booleans = BOOLCOUNT;
-    tp->num_Numbers = NUMCOUNT;
-    tp->num_Strings = STRCOUNT;
-    tp->ext_Booleans = 0;
-    tp->ext_Numbers = 0;
-    tp->ext_Strings = 0;
-#endif
-    if (tp->Booleans == 0)
-       TYPE_MALLOC(NCURSES_SBOOL, BOOLCOUNT, tp->Booleans);
-    if (tp->Numbers == 0)
-       TYPE_MALLOC(short, NUMCOUNT, tp->Numbers);
-    if (tp->Strings == 0)
-       TYPE_MALLOC(char *, STRCOUNT, tp->Strings);
-
-    for_each_boolean(i, tp)
-       tp->Booleans[i] = FALSE;
-
-    for_each_number(i, tp)
-       tp->Numbers[i] = ABSENT_NUMERIC;
-
-    for_each_string(i, tp)
-       tp->Strings[i] = ABSENT_STRING;
-

     next_free = 0;
     next_free = 0;

+
+    _nc_init_termtype(&(tp->tterm));

 }
 
 NCURSES_EXPORT(ENTRY *)
 }
 
 NCURSES_EXPORT(ENTRY *)


@@ -109,7 +85,7 @@ _nc_copy_entry(ENTRY * oldp)
 
     if (newp != 0) {
        *newp = *oldp;
 
     if (newp != 0) {
        *newp = *oldp;

-       _nc_copy_termtype(&(newp->tterm), &(oldp->tterm));
+       _nc_copy_termtype2(&(newp->tterm), &(oldp->tterm));

     }
     return newp;
 }
     }
     return newp;
 }


@@ -120,7 +96,11 @@ _nc_save_str(const char *const string)
 {
     char *result = 0;
     size_t old_next_free = next_free;
 {
     char *result = 0;
     size_t old_next_free = next_free;

-    size_t len = strlen(string) + 1;
+    size_t len;
+
+    if (!VALID_STRING(string))
+       return _nc_save_str("");
+    len = strlen(string) + 1;

 
     if (len == 1 && next_free != 0) {
        /*
 
     if (len == 1 && next_free != 0) {
        /*


@@ -137,7 +117,7 @@ _nc_save_str(const char *const string)
        next_free += len;
        result = (stringbuf + old_next_free);
     } else {
        next_free += len;
        result = (stringbuf + old_next_free);
     } else {

-       _nc_warning("Too much data, some is lost");
+       _nc_warning("Too much data, some is lost: %s", string);

     }
     return result;
 }
     }
     return result;
 }


@@ -150,7 +130,7 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
     int useoffsets[MAX_USES];
     unsigned i, n;
     unsigned nuses = ep->nuses;
     int useoffsets[MAX_USES];
     unsigned i, n;
     unsigned nuses = ep->nuses;

-    TERMTYPE *tp = &(ep->tterm);
+    TERMTYPE2 *tp = &(ep->tterm);

 
     if (copy_strings) {
        next_free = 0;          /* clear static storage */
 
     if (copy_strings) {
        next_free = 0;          /* clear static storage */


@@ -242,11 +222,16 @@ _nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 }
 
 NCURSES_EXPORT(void)
 }
 
 NCURSES_EXPORT(void)

-_nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
+_nc_merge_entry(ENTRY * const target, ENTRY * const source)

 /* merge capabilities from `from' entry into `to' entry */
 {
 /* merge capabilities from `from' entry into `to' entry */
 {

+    TERMTYPE2 *to = &(target->tterm);
+    TERMTYPE2 *from = &(source->tterm);

     unsigned i;
 
     unsigned i;
 

+    if (source == 0 || from == 0 || target == 0 || to == 0)
+       return;
+

 #if NCURSES_XNAMES
     _nc_align_termtype(to, from);
 #endif
 #if NCURSES_XNAMES
     _nc_align_termtype(to, from);
 #endif


@@ -257,18 +242,18 @@ _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)
            if (mergebool == CANCELLED_BOOLEAN)
                to->Booleans[i] = FALSE;
            else if (mergebool == TRUE)

-               to->Booleans[i] = (char) mergebool;
+               to->Booleans[i] = (NCURSES_SBOOL) mergebool;

        }
     }
 
     for_each_number(i, from) {
        if (to->Numbers[i] != CANCELLED_NUMERIC) {
        }
     }
 
     for_each_number(i, from) {
        if (to->Numbers[i] != CANCELLED_NUMERIC) {

-           short mergenum = from->Numbers[i];
+           int mergenum = from->Numbers[i];

 
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;
            else if (mergenum != ABSENT_NUMERIC)
 
            if (mergenum == CANCELLED_NUMERIC)
                to->Numbers[i] = ABSENT_NUMERIC;
            else if (mergenum != ABSENT_NUMERIC)

-               to->Numbers[i] = mergenum;
+               to->Numbers[i] = (NCURSES_INT2) mergenum;

        }
     }
 
        }
     }