ncurses 5.6 - patch 20080816
[ncurses.git] / ncurses / tinfo / alloc_entry.c
index 570b48a9af8066b1296a2df0bce35450ad05ec22..4638e99c4d58d8eb5a152177e900907f6a5c55bb 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2006,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            *
@@ -29,9 +29,9 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
  ****************************************************************************/
 
-
 /*
  * alloc_entry.c -- allocation functions for terminfo entries
  *
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.30 1999/03/01 02:03:45 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.48 2008/08/16 16:25:31 tom Exp $")
 
 #define ABSENT_OFFSET    -1
 #define CANCELLED_OFFSET -2
 
 #define MAX_STRTAB     4096    /* documented maximum entry size */
 
-static char    stringbuf[MAX_STRTAB];  /* buffer for string capabilities */
-static size_t  next_free;              /* next free character in stringbuf */
+static char *stringbuf;                /* buffer for string capabilities */
+static size_t next_free;       /* next free character in stringbuf */
 
-void _nc_init_entry(TERMTYPE *const tp)
+NCURSES_EXPORT(void)
+_nc_init_entry(TERMTYPE *const tp)
 /* initialize a terminal type data block */
 {
-int    i;
+    unsigned i;
+
+#if NO_LEAKS
+    if (tp == 0 && stringbuf != 0) {
+       FreeAndNull(stringbuf);
+       return;
+    }
+#endif
+
+    if (stringbuf == 0)
+       stringbuf = (char *) malloc(MAX_STRTAB);
 
 #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;
+    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)
-           tp->Booleans = typeMalloc(char,BOOLCOUNT);
-       if (tp->Numbers == 0)
-           tp->Numbers = typeMalloc(short,NUMCOUNT);
-       if (tp->Strings == 0)
-           tp->Strings = typeMalloc(char *,STRCOUNT);
+    if (tp->Booleans == 0)
+       tp->Booleans = typeMalloc(NCURSES_SBOOL, BOOLCOUNT);
+    if (tp->Numbers == 0)
+       tp->Numbers = typeMalloc(short, NUMCOUNT);
+    if (tp->Strings == 0)
+       tp->Strings = typeMalloc(char *, STRCOUNT);
 
-       for_each_boolean(i,tp)
-               tp->Booleans[i] = FALSE;
+    for_each_boolean(i, tp)
+       tp->Booleans[i] = FALSE;
 
-       for_each_number(i,tp)
-               tp->Numbers[i] = ABSENT_NUMERIC;
+    for_each_number(i, tp)
+       tp->Numbers[i] = ABSENT_NUMERIC;
 
-       for_each_string(i,tp)
-               tp->Strings[i] = ABSENT_STRING;
+    for_each_string(i, tp)
+       tp->Strings[i] = ABSENT_STRING;
 
-       next_free = 0;
+    next_free = 0;
 }
 
-ENTRY *_nc_copy_entry(ENTRY *oldp)
+NCURSES_EXPORT(ENTRY *)
+_nc_copy_entry(ENTRY * oldp)
 {
-       ENTRY *newp = typeCalloc(ENTRY,1);
+    ENTRY *newp = typeCalloc(ENTRY, 1);
 
-       if (newp != 0) {
-           *newp = *oldp;
-           _nc_copy_termtype(&(newp->tterm), &(oldp->tterm));
-       }
-       return newp;
+    if (newp != 0) {
+       *newp = *oldp;
+       _nc_copy_termtype(&(newp->tterm), &(oldp->tterm));
+    }
+    return newp;
 }
 
-char *_nc_save_str(const char *const string)
 /* save a copy of string in the string buffer */
+NCURSES_EXPORT(char *)
+_nc_save_str(const char *const string)
 {
-size_t old_next_free = next_free;
-size_t len = strlen(string) + 1;
-
-       if (next_free + len < MAX_STRTAB)
-       {
-               strcpy(&stringbuf[next_free], string);
-               DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
-               DEBUG(7, ("at location %d", (int) next_free));
-               next_free += len;
+    char *result = 0;
+    size_t old_next_free = next_free;
+    size_t len = strlen(string) + 1;
+
+    if (len == 1 && next_free != 0) {
+       /*
+        * Cheat a little by making an empty string point to the end of the
+        * previous string.
+        */
+       if (next_free < MAX_STRTAB) {
+           result = (stringbuf + next_free - 1);
        }
-       return(stringbuf + old_next_free);
+    } else if (next_free + len < MAX_STRTAB) {
+       strcpy(&stringbuf[next_free], string);
+       DEBUG(7, ("Saved string %s", _nc_visbuf(string)));
+       DEBUG(7, ("at location %d", (int) next_free));
+       next_free += len;
+       result = (stringbuf + old_next_free);
+    } else {
+       _nc_warning("Too much data, some is lost");
+    }
+    return result;
 }
 
-void _nc_wrap_entry(ENTRY *const ep)
+NCURSES_EXPORT(void)
+_nc_wrap_entry(ENTRY * const ep, bool copy_strings)
 /* copy the string parts to allocated storage, preserving pointers to it */
 {
-int    offsets[MAX_ENTRY_SIZE/2], useoffsets[MAX_USES];
-int    i, n;
-TERMTYPE *tp = &(ep->tterm);
-
-       n = tp->term_names - stringbuf;
-       for_each_string(i, &(ep->tterm)) {
-               if (tp->Strings[i] == ABSENT_STRING)
-                       offsets[i] = ABSENT_OFFSET;
-               else if (tp->Strings[i] == CANCELLED_STRING)
-                       offsets[i] = CANCELLED_OFFSET;
-               else
-                       offsets[i] = tp->Strings[i] - stringbuf;
+    int offsets[MAX_ENTRY_SIZE / sizeof(short)];
+    int useoffsets[MAX_USES];
+    unsigned i, n;
+    unsigned nuses = ep->nuses;
+    TERMTYPE *tp = &(ep->tterm);
+
+    if (copy_strings) {
+       next_free = 0;          /* clear static storage */
+
+       /* copy term_names, Strings, uses */
+       tp->term_names = _nc_save_str(tp->term_names);
+       for_each_string(i, tp) {
+           if (tp->Strings[i] != ABSENT_STRING &&
+               tp->Strings[i] != CANCELLED_STRING) {
+               tp->Strings[i] = _nc_save_str(tp->Strings[i]);
+           }
        }
 
-       for (i=0; i < ep->nuses; i++) {
-               if (ep->uses[i].parent == (void *)0)
-                       useoffsets[i] = ABSENT_OFFSET;
-               else
-                       useoffsets[i] = (char *)(ep->uses[i].parent) - stringbuf;
+       for (i = 0; i < nuses; i++) {
+           if (ep->uses[i].name == 0) {
+               ep->uses[i].name = _nc_save_str(ep->uses[i].name);
+           }
        }
 
-       if ((tp->str_table = typeMalloc(char, next_free)) == (char *)0)
-               _nc_err_abort("Out of memory");
-       (void) memcpy(tp->str_table, stringbuf, next_free);
-
-       tp->term_names = tp->str_table + n;
-       for_each_string(i, &(ep->tterm)) {
-               if (offsets[i] == ABSENT_OFFSET)
-                       tp->Strings[i] = ABSENT_STRING;
-               else if (offsets[i] == CANCELLED_OFFSET)
-                       tp->Strings[i] = CANCELLED_STRING;
-               else
-                       tp->Strings[i] = tp->str_table + offsets[i];
+       free(tp->str_table);
+    }
+
+    assert(tp->term_names >= stringbuf);
+    n = (unsigned) (tp->term_names - stringbuf);
+    for_each_string(i, &(ep->tterm)) {
+       if (i < SIZEOF(offsets)) {
+           if (tp->Strings[i] == ABSENT_STRING) {
+               offsets[i] = ABSENT_OFFSET;
+           } else if (tp->Strings[i] == CANCELLED_STRING) {
+               offsets[i] = CANCELLED_OFFSET;
+           } else {
+               offsets[i] = tp->Strings[i] - stringbuf;
+           }
+       }
+    }
+
+    for (i = 0; i < nuses; i++) {
+       if (ep->uses[i].name == 0)
+           useoffsets[i] = ABSENT_OFFSET;
+       else
+           useoffsets[i] = ep->uses[i].name - stringbuf;
+    }
+
+    if ((tp->str_table = typeMalloc(char, next_free)) == (char *) 0)
+         _nc_err_abort(MSG_NO_MEMORY);
+    (void) memcpy(tp->str_table, stringbuf, next_free);
+
+    tp->term_names = tp->str_table + n;
+    for_each_string(i, &(ep->tterm)) {
+       if (i < SIZEOF(offsets)) {
+           if (offsets[i] == ABSENT_OFFSET) {
+               tp->Strings[i] = ABSENT_STRING;
+           } else if (offsets[i] == CANCELLED_OFFSET) {
+               tp->Strings[i] = CANCELLED_STRING;
+           } else {
+               tp->Strings[i] = tp->str_table + offsets[i];
+           }
        }
+    }
 
 #if NCURSES_XNAMES
-       if ((n = NUM_EXT_NAMES(tp)) != 0) {
+    if (!copy_strings) {
+       if ((n = (unsigned) NUM_EXT_NAMES(tp)) != 0) {
+           if (n < SIZEOF(offsets)) {
                unsigned length = 0;
                for (i = 0; i < n; i++) {
-                       length += strlen(tp->ext_Names[i]) + 1;
-                       offsets[i] = tp->ext_Names[i] - stringbuf;
+                   length += strlen(tp->ext_Names[i]) + 1;
+                   offsets[i] = tp->ext_Names[i] - stringbuf;
                }
                if ((tp->ext_str_table = typeMalloc(char, length)) == 0)
-                       _nc_err_abort("Out of memory");
+                     _nc_err_abort(MSG_NO_MEMORY);
                for (i = 0, length = 0; i < n; i++) {
-                       tp->ext_Names[i] = tp->ext_str_table + length;
-                       strcpy(tp->ext_Names[i], stringbuf + offsets[i]);
-                       length += strlen(tp->ext_Names[i]) + 1;
+                   tp->ext_Names[i] = tp->ext_str_table + length;
+                   strcpy(tp->ext_Names[i], stringbuf + offsets[i]);
+                   length += strlen(tp->ext_Names[i]) + 1;
                }
+           }
        }
+    }
 #endif
 
-       for (i=0; i < ep->nuses; i++) {
-               if (useoffsets[i] == ABSENT_OFFSET)
-                       ep->uses[i].parent = (void *)0;
-               else
-                       ep->uses[i].parent = (char *)(tp->str_table + useoffsets[i]);
-       }
+    for (i = 0; i < nuses; i++) {
+       if (useoffsets[i] == ABSENT_OFFSET)
+           ep->uses[i].name = 0;
+       else
+           ep->uses[i].name = (tp->str_table + useoffsets[i]);
+    }
 }
 
-void _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
+NCURSES_EXPORT(void)
+_nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
 /* merge capabilities from `from' entry into `to' entry */
 {
-    int        i;
+    unsigned i;
 
 #if NCURSES_XNAMES
     _nc_align_termtype(to, from);
 #endif
-    for_each_boolean(i, from)
-    {
-       int     mergebool = from->Booleans[i];
-
-       if (mergebool == CANCELLED_BOOLEAN)
-           to->Booleans[i] = FALSE;
-       else if (mergebool == TRUE)
-           to->Booleans[i] = mergebool;
+    for_each_boolean(i, from) {
+       if (to->Booleans[i] != (char) CANCELLED_BOOLEAN) {
+           int mergebool = from->Booleans[i];
+
+           if (mergebool == CANCELLED_BOOLEAN)
+               to->Booleans[i] = FALSE;
+           else if (mergebool == TRUE)
+               to->Booleans[i] = (char) mergebool;
+       }
     }
 
-    for_each_number(i, from)
-    {
-       int     mergenum = from->Numbers[i];
+    for_each_number(i, from) {
+       if (to->Numbers[i] != CANCELLED_NUMERIC) {
+           short mergenum = from->Numbers[i];
 
-       if (mergenum == CANCELLED_NUMERIC)
-           to->Numbers[i] = ABSENT_NUMERIC;
-       else if (mergenum != ABSENT_NUMERIC)
-           to->Numbers[i] = mergenum;
+           if (mergenum == CANCELLED_NUMERIC)
+               to->Numbers[i] = ABSENT_NUMERIC;
+           else if (mergenum != ABSENT_NUMERIC)
+               to->Numbers[i] = mergenum;
+       }
     }
 
     /*
@@ -213,13 +275,25 @@ void _nc_merge_entry(TERMTYPE *const to, TERMTYPE *const from)
      * storage.  This is OK right now, but will be a problem if we
      * we ever want to deallocate entries.
      */
-    for_each_string(i, from)
-    {
-       char    *mergestring = from->Strings[i];
-
-       if (mergestring == CANCELLED_STRING)
-           to->Strings[i] = ABSENT_STRING;
-       else if (mergestring != ABSENT_STRING)
-           to->Strings[i] = mergestring;
+    for_each_string(i, from) {
+       if (to->Strings[i] != CANCELLED_STRING) {
+           char *mergestring = from->Strings[i];
+
+           if (mergestring == CANCELLED_STRING)
+               to->Strings[i] = ABSENT_STRING;
+           else if (mergestring != ABSENT_STRING)
+               to->Strings[i] = mergestring;
+       }
     }
 }
+
+#if NO_LEAKS
+NCURSES_EXPORT(void)
+_nc_alloc_entry_leaks(void)
+{
+    if (stringbuf != 0) {
+       FreeAndNull(stringbuf);
+    }
+    next_free = 0;
+}
+#endif