X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Falloc_entry.c;h=16f04f8d50cdd7c425b886c9fb7d50a4ef548ee4;hp=17489372e46437534585f040a9b95aaafc980f2a;hb=46722468f47c2b77b3987729b4bcf2321cccfd01;hpb=c633e5103a29a38532cf1925257b91cea33fd090

diff --git a/ncurses/tinfo/alloc_entry.c b/ncurses/tinfo/alloc_entry.c
index 17489372..16f04f8d 100644
--- a/ncurses/tinfo/alloc_entry.c
+++ b/ncurses/tinfo/alloc_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998,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            *
@@ -47,22 +47,25 @@
 #include <tic.h>
 #include <term_entry.h>
 
-MODULE_ID("$Id: alloc_entry.c,v 1.32 2000/03/12 00:16:31 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.37 2002/09/07 20:04:15 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 char *stringbuf;		/* buffer for string capabilities */
 static size_t next_free;	/* next free character in stringbuf */
 
-void
+NCURSES_EXPORT(void)
 _nc_init_entry(TERMTYPE * const tp)
 /* initialize a terminal type data block */
 {
     int i;
 
+    if (stringbuf == 0)
+	stringbuf = malloc(MAX_STRTAB);
+
 #if NCURSES_XNAMES
     tp->num_Booleans = BOOLCOUNT;
     tp->num_Numbers = NUMCOUNT;
@@ -90,7 +93,7 @@ _nc_init_entry(TERMTYPE * const tp)
     next_free = 0;
 }
 
-ENTRY *
+NCURSES_EXPORT(ENTRY *)
 _nc_copy_entry(ENTRY * oldp)
 {
     ENTRY *newp = typeCalloc(ENTRY, 1);
@@ -102,7 +105,7 @@ _nc_copy_entry(ENTRY * oldp)
     return newp;
 }
 
-char *
+NCURSES_EXPORT(char *)
 _nc_save_str(const char *const string)
 /* save a copy of string in the string buffer */
 {
@@ -118,14 +121,35 @@ _nc_save_str(const char *const string)
     return (stringbuf + old_next_free);
 }
 
-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);
 
+    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].name == 0) {
+		ep->uses[i].name = _nc_save_str(ep->uses[i].name);
+	    }
+	}
+
+	free(tp->str_table);
+    }
+
     n = tp->term_names - stringbuf;
     for_each_string(i, &(ep->tterm)) {
 	if (tp->Strings[i] == ABSENT_STRING)
@@ -144,7 +168,7 @@ _nc_wrap_entry(ENTRY * const ep)
     }
 
     if ((tp->str_table = typeMalloc(char, next_free)) == (char *) 0)
-	  _nc_err_abort("Out of memory");
+	  _nc_err_abort(MSG_NO_MEMORY);
     (void) memcpy(tp->str_table, stringbuf, next_free);
 
     tp->term_names = tp->str_table + n;
@@ -158,18 +182,20 @@ _nc_wrap_entry(ENTRY * const ep)
     }
 
 #if NCURSES_XNAMES
-    if ((n = NUM_EXT_NAMES(tp)) != 0) {
-	unsigned length = 0;
-	for (i = 0; i < n; i++) {
-	    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");
-	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;
+    if (!copy_strings) {
+	if ((n = NUM_EXT_NAMES(tp)) != 0) {
+	    unsigned length = 0;
+	    for (i = 0; i < n; i++) {
+		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(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;
+	    }
 	}
     }
 #endif
@@ -182,8 +208,9 @@ _nc_wrap_entry(ENTRY * const ep)
     }
 }
 
-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;