#include <tic.h>
-MODULE_ID("$Id: alloc_entry.c,v 1.71 2022/04/30 18:36:01 tom Exp $")
+MODULE_ID("$Id: alloc_entry.c,v 1.76 2022/09/17 21:45:44 tom Exp $")
#define ABSENT_OFFSET -1
#define CANCELLED_OFFSET -2
_nc_init_entry(ENTRY * const tp)
/* initialize a terminal type data block */
{
- DEBUG(2, (T_CALLED("_nc_init_entry(tp=%p)"), tp));
+ DEBUG(2, (T_CALLED("_nc_init_entry(tp=%p)"), (void *) tp));
if (tp == NULL) {
#if NO_LEAKS
{
ENTRY *newp;
- DEBUG(2, (T_CALLED("_nc_copy_entry(oldp=%p)"), oldp));
+ DEBUG(2, (T_CALLED("_nc_copy_entry(oldp=%p)"), (void *) oldp));
newp = typeCalloc(ENTRY, 1);
if (newp != NULL) {
_nc_copy_termtype2(&(newp->tterm), &(oldp->tterm));
}
- DEBUG(2, (T_RETURN("%p"), newp));
+ DEBUG(2, (T_RETURN("%p"), (void *) newp));
return (newp);
}
{
char *result = 0;
size_t old_next_free = next_free;
- size_t len;
if (stringbuf != NULL) {
+ size_t len;
+
if (!VALID_STRING(string))
string = "";
len = strlen(string) + 1;
unsigned nuses;
TERMTYPE2 *tp;
+ DEBUG(2, (T_CALLED("_nc_wrap_entry(ep=%p, copy_strings=%d)"), (void *)
+ ep, copy_strings));
if (ep == NULL || stringbuf == NULL)
_nc_err_abort("_nc_wrap_entry called without initialization");
#endif
for (i = 0; i < nuses; i++) {
- if (useoffsets[i] == ABSENT_OFFSET)
+ if (useoffsets[i] == ABSENT_OFFSET) {
ep->uses[i].name = 0;
- else
- ep->uses[i].name = (tp->str_table + useoffsets[i]);
+ } else {
+ ep->uses[i].name = strdup(tp->str_table + useoffsets[i]);
+ }
}
+ DEBUG(2, (T_RETURN("")));
}
NCURSES_EXPORT(void)
TERMTYPE2 *from = &(source->tterm);
#if NCURSES_XNAMES
TERMTYPE2 copy;
+ size_t str_size = 0;
+ char *str_table = NULL;
#endif
unsigned i;
_nc_copy_termtype2(©, from);
from = ©
_nc_align_termtype(to, from);
+ str_size += strlen(to->term_names) + 1;
+ for_each_string(i, from) {
+ if (VALID_STRING(from->Strings[i]))
+ str_size += strlen(from->Strings[i]) + 1;
+ }
+ for_each_string(i, to) {
+ if (VALID_STRING(to->Strings[i]))
+ str_size += strlen(to->Strings[i]) + 1;
+ }
+ /* allocate a string-table large enough for both source/target, and
+ * copy all of the strings into that table. In the merge, we will
+ * select from the original source/target lists to construct a new
+ * target list.
+ */
+ if (str_size != 0) {
+ char *str_copied;
+ if ((str_table = malloc(str_size)) == NULL)
+ _nc_err_abort(MSG_NO_MEMORY);
+ str_copied = str_table;
+ strcpy(str_copied, to->term_names);
+ to->term_names = str_copied;
+ str_copied += strlen(str_copied) + 1;
+ for_each_string(i, from) {
+ if (VALID_STRING(from->Strings[i])) {
+ strcpy(str_copied, from->Strings[i]);
+ from->Strings[i] = str_copied;
+ str_copied += strlen(str_copied) + 1;
+ }
+ }
+ for_each_string(i, to) {
+ if (VALID_STRING(to->Strings[i])) {
+ strcpy(str_copied, to->Strings[i]);
+ to->Strings[i] = str_copied;
+ str_copied += strlen(str_copied) + 1;
+ }
+ }
+ free(to->str_table);
+ to->str_table = str_table;
+ free(from->str_table);
+ }
#endif
for_each_boolean(i, from) {
if (to->Booleans[i] != (NCURSES_SBOOL) CANCELLED_BOOLEAN) {