ncurses 6.0 - patch 20170617

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

diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index 97fa06ab591dd38fdf58fc27a61244c26920488d..e0a72670e8c6c225d9bf21afb6e76cefe1c4ae22 100644 (file)
--- a/ncurses/tinfo/write_entry.c
+++ b/ncurses/tinfo/write_entry.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2015,2017 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            *


@@ -39,30 +39,25 @@
 #include <curses.priv.h>
 #include <hashed_db.h>
 
 #include <curses.priv.h>
 #include <hashed_db.h>
 

-#include <sys/stat.h>
-

 #include <tic.h>
 
 #include <tic.h>
 

-#ifndef S_ISDIR
-#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)
-#endif
-

 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
 #else
 #define TRACE_OUT(p)           /*nothing */
 #endif
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
 #else
 #define TRACE_OUT(p)           /*nothing */
 #endif
 

-MODULE_ID("$Id: write_entry.c,v 1.77 2010/08/28 21:04:05 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.99 2017/04/09 23:35:01 tom Exp $")

 
 static int total_written;
 
 static int total_written;

+static int total_parts;
+static int total_size;

 
 static int make_db_root(const char *);
 
 static int make_db_root(const char *);

-static int write_object(TERMTYPE *, char *, unsigned *, unsigned);

 
 #if !USE_HASHED_DB
 static void
 
 #if !USE_HASHED_DB
 static void

-write_file(char *filename, TERMTYPE *tp)
+write_file(char *filename, TERMTYPE2 *tp)

 {
     char buffer[MAX_ENTRY_SIZE];
     unsigned limit = sizeof(buffer);
 {
     char buffer[MAX_ENTRY_SIZE];
     unsigned limit = sizeof(buffer);


@@ -75,8 +70,8 @@ write_file(char *filename, TERMTYPE *tp)
     }
     DEBUG(1, ("Created %s", filename));
 
     }
     DEBUG(1, ("Created %s", filename));
 

-    if (write_object(tp, buffer, &offset, limit) == ERR
-       || fwrite(buffer, sizeof(char), offset, fp) != offset) {
+    if (_nc_write_object(tp, buffer, &offset, limit) == ERR
+       || fwrite(buffer, sizeof(char), (size_t) offset, fp) != offset) {

        _nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename);
     }
 
        _nc_syserr_abort("error writing %s/%s", _nc_tic_dir(0), filename);
     }
 


@@ -99,13 +94,13 @@ check_writeable(int code)
     char dir[sizeof(LEAF_FMT)];
     char *s = 0;
 
     char dir[sizeof(LEAF_FMT)];
     char *s = 0;
 

-    if (code == 0 || (s = strchr(dirnames, code)) == 0)
+    if (code == 0 || (s = (strchr) (dirnames, code)) == 0)

        _nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
 
     if (verified[s - dirnames])
        return;
 
        _nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
 
     if (verified[s - dirnames])
        return;
 

-    sprintf(dir, LEAF_FMT, code);
+    _nc_SPRINTF(dir, _nc_SLIMIT(sizeof(dir)) LEAF_FMT, code);

     if (make_db_root(dir) < 0) {
        _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
     }
     if (make_db_root(dir) < 0) {
        _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
     }


@@ -115,36 +110,35 @@ check_writeable(int code)
 #endif /* !USE_HASHED_DB */
 
 static int
 #endif /* !USE_HASHED_DB */
 
 static int

-make_db_path(char *dst, const char *src, unsigned limit)
+make_db_path(char *dst, const char *src, size_t limit)

 {
     int rc = -1;
     const char *top = _nc_tic_dir(0);
 
     if (src == top || _nc_is_abs_path(src)) {
        if (strlen(src) + 1 <= limit) {
 {
     int rc = -1;
     const char *top = _nc_tic_dir(0);
 
     if (src == top || _nc_is_abs_path(src)) {
        if (strlen(src) + 1 <= limit) {

-           (void) strcpy(dst, src);
+           _nc_STRCPY(dst, src, limit);

            rc = 0;
        }
     } else {
        if (strlen(top) + strlen(src) + 2 <= limit) {
            rc = 0;
        }
     } else {
        if (strlen(top) + strlen(src) + 2 <= limit) {

-           (void) sprintf(dst, "%s/%s", top, src);
+           _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);

            rc = 0;
        }
     }
 #if USE_HASHED_DB
     if (rc == 0) {
            rc = 0;
        }
     }
 #if USE_HASHED_DB
     if (rc == 0) {

-       if (_nc_is_dir_path(dst)) {
-           rc = -1;
-       } else {
-           static const char suffix[] = DBM_SUFFIX;
-           unsigned have = strlen(dst);
-           unsigned need = strlen(suffix);
-           if (have > need && strcmp(dst + have - need, suffix)) {
-               if (have + need <= limit)
-                   strcat(dst, suffix);
-               else
-                   rc = -1;
+       static const char suffix[] = DBM_SUFFIX;
+       size_t have = strlen(dst);
+       size_t need = strlen(suffix);
+       if (have > need && strcmp(dst + (int) (have - need), suffix)) {
+           if (have + need <= limit) {
+               _nc_STRCAT(dst, suffix, limit);
+           } else {
+               rc = -1;

            }
            }

+       } else if (_nc_is_dir_path(dst)) {
+           rc = -1;

        }
     }
 #endif
        }
     }
 #endif


@@ -164,10 +158,11 @@ make_db_root(const char *path)
 #if USE_HASHED_DB
        DB *capdbp;
 
 #if USE_HASHED_DB
        DB *capdbp;
 

-       if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL)
+       if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL) {

            rc = -1;
            rc = -1;

-       else if (_nc_db_close(capdbp) < 0)
+       } else if (_nc_db_close(capdbp) < 0) {

            rc = -1;
            rc = -1;

+       }

 #else
        struct stat statbuf;
 
 #else
        struct stat statbuf;
 


@@ -191,13 +186,16 @@ make_db_root(const char *path)
  * Set the write directory for compiled entries.
  */
 NCURSES_EXPORT(void)
  * Set the write directory for compiled entries.
  */
 NCURSES_EXPORT(void)

-_nc_set_writedir(char *dir)
+_nc_set_writedir(const char *dir)

 {
     const char *destination;
     char actual[PATH_MAX];
 
     if (dir == 0
 {
     const char *destination;
     char actual[PATH_MAX];
 
     if (dir == 0

-       && use_terminfo_vars())
+#ifndef USE_ROOT_ENVIRON
+       && use_terminfo_vars()
+#endif
+       )

        dir = getenv("TERMINFO");
 
     if (dir != 0)
        dir = getenv("TERMINFO");
 
     if (dir != 0)


@@ -250,7 +248,7 @@ _nc_set_writedir(char *dir)
  */
 
 NCURSES_EXPORT(void)
  */
 
 NCURSES_EXPORT(void)

-_nc_write_entry(TERMTYPE *const tp)
+_nc_write_entry(TERMTYPE2 *const tp)

 {
 #if USE_HASHED_DB
 
 {
 #if USE_HASHED_DB
 


@@ -279,16 +277,21 @@ _nc_write_entry(TERMTYPE *const tp)
     char name_list[MAX_TERMINFO_LENGTH];
     char *first_name, *other_names;
     char *ptr;
     char name_list[MAX_TERMINFO_LENGTH];
     char *first_name, *other_names;
     char *ptr;

+    char *term_names = tp->term_names;
+    size_t name_size = strlen(term_names);

 
 

-    assert(strlen(tp->term_names) != 0);
-    assert(strlen(tp->term_names) < sizeof(name_list));
+    if (name_size == 0) {
+       _nc_syserr_abort("no terminal name found.");
+    } else if (name_size >= sizeof(name_list) - 1) {
+       _nc_syserr_abort("terminal name too long: %s", term_names);
+    }

 
 

-    (void) strcpy(name_list, tp->term_names);
+    _nc_STRCPY(name_list, term_names, sizeof(name_list));

     DEBUG(7, ("Name list = '%s'", name_list));
 
     first_name = name_list;
 
     DEBUG(7, ("Name list = '%s'", name_list));
 
     first_name = name_list;
 

-    ptr = &name_list[strlen(name_list) - 1];
+    ptr = &name_list[name_size - 1];

     other_names = ptr + 1;
 
     while (ptr > name_list && *ptr != '|')
     other_names = ptr + 1;
 
     while (ptr > name_list && *ptr != '|')


@@ -314,7 +317,7 @@ _nc_write_entry(TERMTYPE *const tp)
     _nc_set_type(first_name);
 
 #if USE_HASHED_DB
     _nc_set_type(first_name);
 
 #if USE_HASHED_DB

-    if (write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
+    if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {

        DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE);
        DBT key, data;
 
        DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE);
        DBT key, data;
 


@@ -322,8 +325,8 @@ _nc_write_entry(TERMTYPE *const tp)
            buffer[0] = 0;
 
            memset(&key, 0, sizeof(key));
            buffer[0] = 0;
 
            memset(&key, 0, sizeof(key));

-           key.data = tp->term_names;
-           key.size = strlen(tp->term_names);
+           key.data = term_names;
+           key.size = name_size;

 
            memset(&data, 0, sizeof(data));
            data.data = buffer;
 
            memset(&data, 0, sizeof(data));
            data.data = buffer;


@@ -336,9 +339,13 @@ _nc_write_entry(TERMTYPE *const tp)
            key.data = name_list;
            key.size = strlen(name_list);
 
            key.data = name_list;
            key.size = strlen(name_list);
 

-           strcpy(buffer + 1, tp->term_names);
-           data.size = strlen(tp->term_names) + 1;
+           _nc_STRCPY(buffer + 1,
+                      term_names,
+                      sizeof(buffer) - 1);
+           data.size = name_size + 1;

 
 

+           total_size += data.size;
+           total_parts++;

            _nc_db_put(capdb, &key, &data);
 
            while (*other_names != '\0') {
            _nc_db_put(capdb, &key, &data);
 
            while (*other_names != '\0') {


@@ -353,9 +360,10 @@ _nc_write_entry(TERMTYPE *const tp)
                key.data = ptr;
                key.size = strlen(ptr);
 
                key.data = ptr;
                key.size = strlen(ptr);
 

+               total_size += data.size;
+               total_parts++;

                _nc_db_put(capdb, &key, &data);
            }
                _nc_db_put(capdb, &key, &data);
            }

-           _nc_db_close(capdb);

        }
     }
 #else /* !USE_HASHED_DB */
        }
     }
 #else /* !USE_HASHED_DB */


@@ -366,7 +374,8 @@ _nc_write_entry(TERMTYPE *const tp)
     if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))
        _nc_warning("terminal name too long.");
 
     if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))
        _nc_warning("terminal name too long.");
 

-    sprintf(filename, LEAF_FMT "/%s", first_name[0], first_name);
+    _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))
+               LEAF_FMT "/%s", first_name[0], first_name);

 
     /*
      * Has this primary name been written since the first call to
 
     /*
      * Has this primary name been written since the first call to


@@ -376,7 +385,22 @@ _nc_write_entry(TERMTYPE *const tp)
     if (start_time > 0 &&
        stat(filename, &statbuf) >= 0
        && statbuf.st_mtime >= start_time) {
     if (start_time > 0 &&
        stat(filename, &statbuf) >= 0
        && statbuf.st_mtime >= start_time) {

+#if HAVE_LINK && !USE_SYMLINKS
+       /*
+        * If the file has more than one link, the reason for the previous
+        * write could be that the current primary name used to be an alias for
+        * the previous entry.  In that case, unlink the file so that we will
+        * not modify the previous entry as we write this one.
+        */
+       if (statbuf.st_nlink > 1) {
+           _nc_warning("name redefined.");
+           unlink(filename);
+       } else {
+           _nc_warning("name multiply defined.");
+       }
+#else

        _nc_warning("name multiply defined.");
        _nc_warning("name multiply defined.");

+#endif

     }
 
     check_writeable(first_name[0]);
     }
 
     check_writeable(first_name[0]);


@@ -407,7 +431,8 @@ _nc_write_entry(TERMTYPE *const tp)
        }
 
        check_writeable(ptr[0]);
        }
 
        check_writeable(ptr[0]);

-       sprintf(linkname, LEAF_FMT "/%s", ptr[0], ptr);
+       _nc_SPRINTF(linkname, _nc_SLIMIT(sizeof(linkname))
+                   LEAF_FMT "/%s", ptr[0], ptr);

 
        if (strcmp(filename, linkname) == 0) {
            _nc_warning("self-synonym ignored");
 
        if (strcmp(filename, linkname) == 0) {
            _nc_warning("self-synonym ignored");


@@ -419,13 +444,14 @@ _nc_write_entry(TERMTYPE *const tp)
        {
            int code;
 #if USE_SYMLINKS
        {
            int code;
 #if USE_SYMLINKS

-           if (first_name[0] == linkname[0])
-               strncpy(symlinkname, first_name, sizeof(symlinkname) - 1);
-           else {
-               strcpy(symlinkname, "../");
-               strncat(symlinkname, filename, sizeof(symlinkname) - 4);
+#define MY_SIZE sizeof(symlinkname) - 1
+           if (first_name[0] == linkname[0]) {
+               _nc_STRNCPY(symlinkname, first_name, MY_SIZE);
+           } else {
+               _nc_STRCPY(symlinkname, "../", sizeof(symlinkname));
+               _nc_STRNCPY(symlinkname + 3, filename, MY_SIZE - 3);

            }
            }

-           symlinkname[sizeof(symlinkname) - 1] = '\0';
+           symlinkname[MY_SIZE] = '\0';

 #endif /* USE_SYMLINKS */
 #if HAVE_REMOVE
            code = remove(linkname);
 #endif /* USE_SYMLINKS */
 #if HAVE_REMOVE
            code = remove(linkname);


@@ -469,29 +495,29 @@ _nc_write_entry(TERMTYPE *const tp)
 #endif /* USE_HASHED_DB */
 }
 
 #endif /* USE_HASHED_DB */
 }
 

-static unsigned
+static size_t

 fake_write(char *dst,
           unsigned *offset,
 fake_write(char *dst,
           unsigned *offset,

-          unsigned limit,
+          size_t limit,

           char *src,
           char *src,

-          unsigned want,
-          unsigned size)
+          size_t want,
+          size_t size)

 {
 {

-    unsigned have = (limit - *offset);
+    size_t have = (limit - *offset);

 
     want *= size;
     if (have > 0) {
        if (want > have)
            want = have;
        memcpy(dst + *offset, src, want);
 
     want *= size;
     if (have > 0) {
        if (want > have)
            want = have;
        memcpy(dst + *offset, src, want);

-       *offset += want;
+       *offset += (unsigned) want;

     } else {
        want = 0;
     }
     return (want / size);
 }
 
     } else {
        want = 0;
     }
     return (want / size);
 }
 

-#define Write(buf, size, count) fake_write(buffer, offset, limit, (char *) buf, count, size)
+#define Write(buf, size, count) fake_write(buffer, offset, (size_t) limit, (char *) buf, (size_t) count, (size_t) size)

 
 #undef LITTLE_ENDIAN           /* BSD/OS defines this as a feature macro */
 #define HI(x)                  ((x) / 256)
 
 #undef LITTLE_ENDIAN           /* BSD/OS defines this as a feature macro */
 #define HI(x)                  ((x) / 256)


@@ -502,10 +528,10 @@ fake_write(char *dst,
 #define WRITE_STRING(str) (Write(str, sizeof(char), strlen(str) + 1) == strlen(str) + 1)
 
 static int
 #define WRITE_STRING(str) (Write(str, sizeof(char), strlen(str) + 1) == strlen(str) + 1)
 
 static int

-compute_offsets(char **Strings, unsigned strmax, short *offsets)
+compute_offsets(char **Strings, size_t strmax, short *offsets)

 {
     int nextfree = 0;
 {
     int nextfree = 0;

-    unsigned i;
+    size_t i;

 
     for (i = 0; i < strmax; i++) {
        if (Strings[i] == ABSENT_STRING) {
 
     for (i = 0; i < strmax; i++) {
        if (Strings[i] == ABSENT_STRING) {


@@ -523,9 +549,9 @@ compute_offsets(char **Strings, unsigned strmax, short *offsets)
 }
 
 static void
 }
 
 static void

-convert_shorts(unsigned char *buf, short *Numbers, unsigned count)
+convert_shorts(unsigned char *buf, short *Numbers, size_t count)

 {
 {

-    unsigned i;
+    size_t i;

     for (i = 0; i < count; i++) {
        if (Numbers[i] == ABSENT_NUMERIC) {     /* HI/LO won't work */
            buf[2 * i] = buf[2 * i + 1] = 0377;
     for (i = 0; i < count; i++) {
        if (Numbers[i] == ABSENT_NUMERIC) {     /* HI/LO won't work */
            buf[2 * i] = buf[2 * i + 1] = 0377;


@@ -534,17 +560,39 @@ convert_shorts(unsigned char *buf, short *Numbers, unsigned count)
            buf[2 * i + 1] = 0377;
        } else {
            LITTLE_ENDIAN(buf + 2 * i, Numbers[i]);
            buf[2 * i + 1] = 0377;
        } else {
            LITTLE_ENDIAN(buf + 2 * i, Numbers[i]);

-           TRACE_OUT(("put Numbers[%d]=%d", i, Numbers[i]));
+           TRACE_OUT(("put Numbers[%u]=%d", (unsigned) i, Numbers[i]));

        }
     }
 }
 
        }
     }
 }
 

+#if NCURSES_EXT_NUMBERS
+static void
+convert_numbers(unsigned char *buf, NCURSES_INT2 *Numbers, size_t count)
+{
+    size_t i;
+    for (i = 0; i < count; i++) {
+       if (Numbers[i] == ABSENT_NUMERIC) {     /* HI/LO won't work */
+           buf[2 * i] = buf[2 * i + 1] = 0377;
+       } else if (Numbers[i] == CANCELLED_NUMERIC) {   /* HI/LO won't work */
+           buf[2 * i] = 0376;
+           buf[2 * i + 1] = 0377;
+       } else {
+           LITTLE_ENDIAN(buf + 2 * i, Numbers[i]);
+           TRACE_OUT(("put Numbers[%u]=%d", (unsigned) i, Numbers[i]));
+       }
+    }
+}
+
+#else
+#define convert_numbers(buf,vec,len) convert_shorts(buf,vec,len)
+#endif
+

 #define even_boundary(value) \
            ((value) % 2 != 0 && Write(&zero, sizeof(char), 1) != 1)
 
 #if NCURSES_XNAMES
 static unsigned
 #define even_boundary(value) \
            ((value) % 2 != 0 && Write(&zero, sizeof(char), 1) != 1)
 
 #if NCURSES_XNAMES
 static unsigned

-extended_Booleans(TERMTYPE *tp)
+extended_Booleans(TERMTYPE2 *tp)

 {
     unsigned result = 0;
     unsigned i;
 {
     unsigned result = 0;
     unsigned i;


@@ -557,7 +605,7 @@ extended_Booleans(TERMTYPE *tp)
 }
 
 static unsigned
 }
 
 static unsigned

-extended_Numbers(TERMTYPE *tp)
+extended_Numbers(TERMTYPE2 *tp)

 {
     unsigned result = 0;
     unsigned i;
 {
     unsigned result = 0;
     unsigned i;


@@ -570,7 +618,7 @@ extended_Numbers(TERMTYPE *tp)
 }
 
 static unsigned
 }
 
 static unsigned

-extended_Strings(TERMTYPE *tp)
+extended_Strings(TERMTYPE2 *tp)

 {
     unsigned short result = 0;
     unsigned short i;
 {
     unsigned short result = 0;
     unsigned short i;


@@ -587,7 +635,7 @@ extended_Strings(TERMTYPE *tp)
  * clause - discard the unneeded data.
  */
 static bool
  * clause - discard the unneeded data.
  */
 static bool

-extended_object(TERMTYPE *tp)
+extended_object(TERMTYPE2 *tp)

 {
     bool result = FALSE;
 
 {
     bool result = FALSE;
 


@@ -600,8 +648,8 @@ extended_object(TERMTYPE *tp)
 }
 #endif
 
 }
 #endif
 

-static int
-write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
+NCURSES_EXPORT(int)
+_nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit)

 {
     char *namelist;
     size_t namelen, boolmax, nummax, strmax;
 {
     char *namelist;
     size_t namelen, boolmax, nummax, strmax;


@@ -679,7 +727,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
     TRACE_OUT(("Numerics begin at %04x", *offset));
 
     /* the numerics */
     TRACE_OUT(("Numerics begin at %04x", *offset));
 
     /* the numerics */

-    convert_shorts(buf, tp->Numbers, nummax);
+    convert_numbers(buf, tp->Numbers, nummax);

     if (Write(buf, 2, nummax) != nummax)
        return (ERR);
 
     if (Write(buf, 2, nummax) != nummax)
        return (ERR);
 


@@ -706,7 +754,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
            return (ERR);
 
        nextfree = compute_offsets(tp->Strings + STRCOUNT,
            return (ERR);
 
        nextfree = compute_offsets(tp->Strings + STRCOUNT,

-                                  tp->ext_Strings,
+                                  (size_t) tp->ext_Strings,

                                   offsets);
        TRACE_OUT(("after extended string capabilities, nextfree=%d", nextfree));
 
                                   offsets);
        TRACE_OUT(("after extended string capabilities, nextfree=%d", nextfree));
 


@@ -714,7 +762,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
            return (ERR);
 
        nextfree += compute_offsets(tp->ext_Names,
            return (ERR);
 
        nextfree += compute_offsets(tp->ext_Names,

-                                   extcnt,
+                                   (size_t) extcnt,

                                    offsets + tp->ext_Strings);
        TRACE_OUT(("after extended capnames, nextfree=%d", nextfree));
        strmax = tp->ext_Strings + extcnt;
                                    offsets + tp->ext_Strings);
        TRACE_OUT(("after extended capnames, nextfree=%d", nextfree));
        strmax = tp->ext_Strings + extcnt;


@@ -742,7 +790,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 
        TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset));
        if (tp->ext_Numbers) {
 
        TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset));
        if (tp->ext_Numbers) {

-           convert_shorts(buf, tp->Numbers + NUMCOUNT, tp->ext_Numbers);
+           convert_numbers(buf, tp->Numbers + NUMCOUNT, (size_t) tp->ext_Numbers);

            if (Write(buf, 2, tp->ext_Numbers) != tp->ext_Numbers)
                return (ERR);
        }
            if (Write(buf, 2, tp->ext_Numbers) != tp->ext_Numbers)
                return (ERR);
        }


@@ -782,6 +830,8 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 #endif /* NCURSES_XNAMES */
 
     total_written++;
 #endif /* NCURSES_XNAMES */
 
     total_written++;

+    total_parts++;
+    total_size = total_size + (int) (*offset + 1);

     return (OK);
 }
 
     return (OK);
 }
 


@@ -791,5 +841,7 @@ write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 NCURSES_EXPORT(int)
 _nc_tic_written(void)
 {
 NCURSES_EXPORT(int)
 _nc_tic_written(void)
 {

+    TR(TRACE_DATABASE, ("_nc_tic_written %d entries, %d parts, %d size",
+                       total_written, total_parts, total_size));

     return total_written;
 }
     return total_written;
 }