ncurses 6.0 - patch 20170729

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

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

- * Copyright (c) 1998-2000,2002 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            *


@@ -29,6 +29,7 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *

+ *     and: Thomas E. Dickey                        1996-on                 *

  ****************************************************************************/
 
 /*
  ****************************************************************************/
 
 /*


@@ -36,31 +37,32 @@
  */
 
 #include <curses.priv.h>
  */
 
 #include <curses.priv.h>

-
-#include <sys/stat.h>
+#include <hashed_db.h>

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

-#include <term_entry.h>
-
-#ifndef S_ISDIR
-#define S_ISDIR(mode) ((mode & S_IFMT) == S_IFDIR)
-#endif

 
 

-#if 0
+#if 1

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

-MODULE_ID("$Id: write_entry.c,v 1.58 2002/04/21 20:35:08 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 write_object(FILE *, TERMTYPE *);
+static int make_db_root(const char *);

 
 

+#if !USE_HASHED_DB

 static void
 static void

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

 {
 {

+    char buffer[MAX_ENTRY_SIZE];
+    unsigned limit = sizeof(buffer);
+    unsigned offset = 0;
+

     FILE *fp = (_nc_access(filename, W_OK) == 0) ? fopen(filename, "wb") : 0;
     if (fp == 0) {
        perror(filename);
     FILE *fp = (_nc_access(filename, W_OK) == 0) ? fopen(filename, "wb") : 0;
     if (fp == 0) {
        perror(filename);


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

-    if (write_object(fp, tp) == ERR) {
+    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);
     }

+

     fclose(fp);
 }
 
 /*
     fclose(fp);
 }
 
 /*

- *     make_directory(char *path)
+ * Check for access rights to destination directories
+ * Create any directories which don't exist.

  *
  *

- *     Make a directory if it doesn't exist.
+ * Note:  there's no reason to return the result of make_db_root(), since
+ * this function is called only in instances where that has to succeed.
+ */
+static void
+check_writeable(int code)
+{
+    static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+    static bool verified[sizeof(dirnames)];
+
+    char dir[sizeof(LEAF_FMT)];
+    char *s = 0;
+
+    if (code == 0 || (s = (strchr) (dirnames, code)) == 0)
+       _nc_err_abort("Illegal terminfo subdirectory \"" LEAF_FMT "\"", code);
+
+    if (verified[s - dirnames])
+       return;
+
+    _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);
+    }
+
+    verified[s - dirnames] = TRUE;
+}
+#endif /* !USE_HASHED_DB */
+
+static int
+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) {
+           _nc_STRCPY(dst, src, limit);
+           rc = 0;
+       }
+    } else {
+       if (strlen(top) + strlen(src) + 2 <= limit) {
+           _nc_SPRINTF(dst, _nc_SLIMIT(limit) "%s/%s", top, src);
+           rc = 0;
+       }
+    }
+#if USE_HASHED_DB
+    if (rc == 0) {
+       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
+    return rc;
+}
+
+/*
+ * Make a database-root if it doesn't exist.

  */
 static int
  */
 static int

-make_directory(const char *path)
+make_db_root(const char *path)

 {
     int rc;
 {
     int rc;

-    struct stat statbuf;

     char fullpath[PATH_MAX];
     char fullpath[PATH_MAX];

-    const char *destination = _nc_tic_dir(0);

 
 

-    if (path == destination || *path == '/') {
-       if (strlen(path) + 1 > sizeof(fullpath))
-           return (-1);
-       (void) strcpy(fullpath, path);
-    } else {
-       if (strlen(destination) + strlen(path) + 2 > sizeof(fullpath))
-           return (-1);
-       (void) sprintf(fullpath, "%s/%s", destination, path);
-    }
+    if ((rc = make_db_path(fullpath, path, sizeof(fullpath))) == 0) {
+#if USE_HASHED_DB
+       DB *capdbp;

 
 

-    if ((rc = stat(path, &statbuf)) < 0) {
-       rc = mkdir(path, 0777);
-    } else {
-       if (_nc_access(path, R_OK | W_OK | X_OK) < 0) {
+       if ((capdbp = _nc_db_open(fullpath, TRUE)) == NULL) {
+           rc = -1;
+       } else if (_nc_db_close(capdbp) < 0) {
+           rc = -1;
+       }
+#else
+       struct stat statbuf;
+
+       if ((rc = stat(path, &statbuf)) < 0) {
+           rc = mkdir(path
+#if !defined(__MINGW32__)
+                      ,0777
+#endif
+               );
+       } else if (_nc_access(path, R_OK | W_OK | X_OK) < 0) {

            rc = -1;            /* permission denied */
        } else if (!(S_ISDIR(statbuf.st_mode))) {
            rc = -1;            /* not a directory */
        }
            rc = -1;            /* permission denied */
        } else if (!(S_ISDIR(statbuf.st_mode))) {
            rc = -1;            /* not a directory */
        }

+#endif

     }
     return rc;
 }
 
     }
     return rc;
 }
 

+/*
+ * Set the write directory for compiled entries.
+ */

 NCURSES_EXPORT(void)
 NCURSES_EXPORT(void)

-_nc_set_writedir(char *dir)
-/* set the write directory for compiled entries */
+_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)
        (void) _nc_tic_dir(dir);
 
     destination = _nc_tic_dir(0);
        dir = getenv("TERMINFO");
 
     if (dir != 0)
        (void) _nc_tic_dir(dir);
 
     destination = _nc_tic_dir(0);

-    if (make_directory(destination) < 0) {
+    if (make_db_root(destination) < 0) {

        char *home = _nc_home_terminfo();
 
        if (home != 0) {
            destination = home;
        char *home = _nc_home_terminfo();
 
        if (home != 0) {
            destination = home;

-           if (make_directory(destination) < 0)
+           if (make_db_root(destination) < 0)

                _nc_err_abort("%s: permission denied (errno %d)",
                              destination, errno);
        }
                _nc_err_abort("%s: permission denied (errno %d)",
                              destination, errno);
        }


@@ -139,51 +217,17 @@ _nc_set_writedir(char *dir)
      * Note: because of this code, this logic should be exercised
      * *once only* per run.
      */
      * Note: because of this code, this logic should be exercised
      * *once only* per run.
      */

+#if USE_HASHED_DB
+    make_db_path(actual, destination, sizeof(actual));
+#else

     if (chdir(_nc_tic_dir(destination)) < 0
        || getcwd(actual, sizeof(actual)) == 0)
        _nc_err_abort("%s: not a directory", destination);
     if (chdir(_nc_tic_dir(destination)) < 0
        || getcwd(actual, sizeof(actual)) == 0)
        _nc_err_abort("%s: not a directory", destination);

+#endif

     _nc_keep_tic_dir(strdup(actual));
 }
 
 /*
     _nc_keep_tic_dir(strdup(actual));
 }
 
 /*

- *     check_writeable(char code)
- *
- *     Miscellaneous initialisations
- *
- *     Check for access rights to destination directories
- *     Create any directories which don't exist.
- *     Note: there's no reason to return the result of make_directory(), since
- *     this function is called only in instances where that has to succeed.
- *
- */
-
-static void
-check_writeable(int code)
-{
-    static const char dirnames[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-    static bool verified[sizeof(dirnames)];
-
-    char dir[2];
-    char *s = 0;
-
-    if (code == 0 || (s = strchr(dirnames, code)) == 0)
-       _nc_err_abort("Illegal terminfo subdirectory \"%c\"", code);
-
-    if (verified[s - dirnames])
-       return;
-
-    dir[0] = code;
-    dir[1] = '\0';
-    if (make_directory(dir) < 0) {
-       _nc_err_abort("%s/%s: permission denied", _nc_tic_dir(0), dir);
-    }
-
-    verified[s - dirnames] = TRUE;
-}
-
-/*
- *     _nc_write_entry()
- *

  *     Save the compiled version of a description in the filesystem.
  *
  *     make a copy of the name-list
  *     Save the compiled version of a description in the filesystem.
  *
  *     make a copy of the name-list


@@ -203,13 +247,18 @@ check_writeable(int code)
  *     _nc_curr_line is properly set before the write_entry() call.
  */
 
  *     _nc_curr_line is properly set before the write_entry() call.
  */
 

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

 {
 {

+#if USE_HASHED_DB
+
+    char buffer[MAX_ENTRY_SIZE + 1];
+    unsigned limit = sizeof(buffer);
+    unsigned offset = 0;
+
+#else /* !USE_HASHED_DB */
+

     struct stat statbuf;
     struct stat statbuf;

-    char name_list[MAX_TERMINFO_LENGTH];
-    char *first_name, *other_names;
-    char *ptr;

     char filename[PATH_MAX];
     char linkname[PATH_MAX];
 #if USE_SYMLINKS
     char filename[PATH_MAX];
     char linkname[PATH_MAX];
 #if USE_SYMLINKS


@@ -219,19 +268,30 @@ _nc_write_entry(TERMTYPE * const tp)
 #define HAVE_LINK 1
 #endif
 #endif /* USE_SYMLINKS */
 #define HAVE_LINK 1
 #endif
 #endif /* USE_SYMLINKS */

+

     static int call_count;
     static time_t start_time;  /* time at start of writes */
 
     static int call_count;
     static time_t start_time;  /* time at start of writes */
 

-    if (call_count++ == 0) {
-       start_time = 0;
+#endif /* USE_HASHED_DB */
+
+    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);
+
+    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 != '|')


@@ -256,10 +316,66 @@ _nc_write_entry(TERMTYPE * const tp)
 
     _nc_set_type(first_name);
 
 
     _nc_set_type(first_name);
 

-    if (strlen(first_name) > sizeof(filename) - 3)
+#if USE_HASHED_DB
+    if (_nc_write_object(tp, buffer + 1, &offset, limit - 1) != ERR) {
+       DB *capdb = _nc_db_open(_nc_tic_dir(0), TRUE);
+       DBT key, data;
+
+       if (capdb != 0) {
+           buffer[0] = 0;
+
+           memset(&key, 0, sizeof(key));
+           key.data = term_names;
+           key.size = name_size;
+
+           memset(&data, 0, sizeof(data));
+           data.data = buffer;
+           data.size = offset + 1;
+
+           _nc_db_put(capdb, &key, &data);
+
+           buffer[0] = 2;
+
+           key.data = name_list;
+           key.size = strlen(name_list);
+
+           _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') {
+               ptr = other_names++;
+               assert(ptr < buffer + sizeof(buffer) - 1);
+               while (*other_names != '|' && *other_names != '\0')
+                   other_names++;
+
+               if (*other_names != '\0')
+                   *(other_names++) = '\0';
+
+               key.data = ptr;
+               key.size = strlen(ptr);
+
+               total_size += data.size;
+               total_parts++;
+               _nc_db_put(capdb, &key, &data);
+           }
+       }
+    }
+#else /* !USE_HASHED_DB */
+    if (call_count++ == 0) {
+       start_time = 0;
+    }
+
+    if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))

        _nc_warning("terminal name too long.");
 
        _nc_warning("terminal name too long.");
 

-    sprintf(filename, "%c/%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


@@ -269,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]);


@@ -290,7 +421,7 @@ _nc_write_entry(TERMTYPE * const tp)
        if (*other_names != '\0')
            *(other_names++) = '\0';
 
        if (*other_names != '\0')
            *(other_names++) = '\0';
 

-       if (strlen(ptr) > sizeof(linkname) - 3) {
+       if (strlen(ptr) > sizeof(linkname) - (2 + LEAF_LEN)) {

            _nc_warning("terminal alias %s too long.", ptr);
            continue;
        }
            _nc_warning("terminal alias %s too long.", ptr);
            continue;
        }


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

-       sprintf(linkname, "%c/%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");


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

-           strcpy(symlinkname, "../");
-           strncat(symlinkname, filename, sizeof(symlinkname) - 4);
-           symlinkname[sizeof(symlinkname) - 1] = '\0';
+#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[MY_SIZE] = '\0';

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


@@ -355,20 +492,46 @@ _nc_write_entry(TERMTYPE * const tp)
            write_file(linkname, tp);
 #endif /* HAVE_LINK */
     }
            write_file(linkname, tp);
 #endif /* HAVE_LINK */
     }

+#endif /* USE_HASHED_DB */
+}
+
+static size_t
+fake_write(char *dst,
+          unsigned *offset,
+          size_t limit,
+          char *src,
+          size_t want,
+          size_t size)
+{
+    size_t have = (limit - *offset);
+
+    want *= size;
+    if (have > 0) {
+       if (want > have)
+           want = have;
+       memcpy(dst + *offset, src, want);
+       *offset += (unsigned) want;
+    } else {
+       want = 0;
+    }
+    return (want / 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)
 #define LO(x)                  ((x) % 256)
 #undef LITTLE_ENDIAN           /* BSD/OS defines this as a feature macro */
 #define HI(x)                  ((x) / 256)
 #define LO(x)                  ((x) % 256)

-#define LITTLE_ENDIAN(p, x)    (p)[0] = LO(x), (p)[1] = HI(x)
+#define LITTLE_ENDIAN(p, x)    (p)[0] = (unsigned char)LO(x),  \
+                                (p)[1] = (unsigned char)HI(x)

 
 

-#define WRITE_STRING(str) (fwrite(str, sizeof(char), strlen(str) + 1, fp) == strlen(str) + 1)
+#define WRITE_STRING(str) (Write(str, sizeof(char), strlen(str) + 1) == strlen(str) + 1)

 
 static int
 
 static int

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

 {
 {

-    size_t nextfree = 0;
-    unsigned i;
+    int nextfree = 0;
+    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) {


@@ -376,18 +539,37 @@ compute_offsets(char **Strings, unsigned strmax, short *offsets)
        } else if (Strings[i] == CANCELLED_STRING) {
            offsets[i] = -2;
        } else {
        } else if (Strings[i] == CANCELLED_STRING) {
            offsets[i] = -2;
        } else {

-           offsets[i] = nextfree;
-           nextfree += strlen(Strings[i]) + 1;
-           TRACE_OUT(("put Strings[%d]=%s(%d)", i, _nc_visbuf(Strings[i]), nextfree));
+           offsets[i] = (short) nextfree;
+           nextfree += (int) strlen(Strings[i]) + 1;
+           TRACE_OUT(("put Strings[%d]=%s(%d)", (int) i,
+                      _nc_visbuf(Strings[i]), (int) nextfree));

        }
     }
     return nextfree;
 }
 
 static void
        }
     }
     return nextfree;
 }
 
 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;
+       } 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]));
+       }
+    }
+}
+
+#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;
     for (i = 0; i < count; i++) {
        if (Numbers[i] == ABSENT_NUMERIC) {     /* HI/LO won't work */
            buf[2 * i] = buf[2 * i + 1] = 0377;


@@ -396,22 +578,84 @@ 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]));

        }
     }
 }
 
        }
     }
 }
 

+#else
+#define convert_numbers(buf,vec,len) convert_shorts(buf,vec,len)
+#endif
+

 #define even_boundary(value) \
 #define even_boundary(value) \

-           ((value) % 2 != 0 && fwrite(&zero, sizeof(char), 1, fp) != 1)
+           ((value) % 2 != 0 && Write(&zero, sizeof(char), 1) != 1)

 
 

-static int
-write_object(FILE * fp, TERMTYPE * tp)
+#if NCURSES_XNAMES
+static unsigned
+extended_Booleans(TERMTYPE2 *tp)
+{
+    unsigned result = 0;
+    unsigned i;
+
+    for (i = 0; i < tp->ext_Booleans; ++i) {
+       if (tp->Booleans[BOOLCOUNT + i] == TRUE)
+           result = (i + 1);
+    }
+    return result;
+}
+
+static unsigned
+extended_Numbers(TERMTYPE2 *tp)
+{
+    unsigned result = 0;
+    unsigned i;
+
+    for (i = 0; i < tp->ext_Numbers; ++i) {
+       if (tp->Numbers[NUMCOUNT + i] != ABSENT_NUMERIC)
+           result = (i + 1);
+    }
+    return result;
+}
+
+static unsigned
+extended_Strings(TERMTYPE2 *tp)
+{
+    unsigned short result = 0;
+    unsigned short i;
+
+    for (i = 0; i < tp->ext_Strings; ++i) {
+       if (tp->Strings[STRCOUNT + i] != ABSENT_STRING)
+           result = (unsigned short) (i + 1);
+    }
+    return result;
+}
+
+/*
+ * _nc_align_termtype() will extend entries that are referenced in a use=
+ * clause - discard the unneeded data.
+ */
+static bool
+extended_object(TERMTYPE2 *tp)
+{
+    bool result = FALSE;
+
+    if (_nc_user_definable) {
+       result = ((extended_Booleans(tp)
+                  + extended_Numbers(tp)
+                  + extended_Strings(tp)) != 0);
+    }
+    return result;
+}
+#endif
+
+NCURSES_EXPORT(int)
+_nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit)

 {
     char *namelist;
     size_t namelen, boolmax, nummax, strmax;
     char zero = '\0';
     size_t i;
 {
     char *namelist;
     size_t namelen, boolmax, nummax, strmax;
     char zero = '\0';
     size_t i;

-    short nextfree;
+    int nextfree;

     short offsets[MAX_ENTRY_SIZE / 2];
     unsigned char buf[MAX_ENTRY_SIZE];
     unsigned last_bool = BOOLWRITE;
     short offsets[MAX_ENTRY_SIZE / 2];
     unsigned char buf[MAX_ENTRY_SIZE];
     unsigned last_bool = BOOLWRITE;


@@ -464,9 +708,9 @@ write_object(FILE * fp, TERMTYPE * tp)
     LITTLE_ENDIAN(buf + 10, nextfree);
 
     /* write out the header */
     LITTLE_ENDIAN(buf + 10, nextfree);
 
     /* write out the header */

-    TRACE_OUT(("Header of %s @%ld", namelist, ftell(fp)));
-    if (fwrite(buf, 12, 1, fp) != 1
-       || fwrite(namelist, sizeof(char), namelen, fp) != namelen)
+    TRACE_OUT(("Header of %s @%d", namelist, *offset));
+    if (Write(buf, 12, 1) != 1
+       || Write(namelist, sizeof(char), namelen) != namelen)

          return (ERR);
 
     for (i = 0; i < boolmax; i++)
          return (ERR);
 
     for (i = 0; i < boolmax; i++)


@@ -474,27 +718,27 @@ write_object(FILE * fp, TERMTYPE * tp)
            buf[i] = TRUE;
        else
            buf[i] = FALSE;
            buf[i] = TRUE;
        else
            buf[i] = FALSE;

-    if (fwrite(buf, sizeof(char), boolmax, fp) != boolmax)
+    if (Write(buf, sizeof(char), boolmax) != boolmax)

          return (ERR);
 
     if (even_boundary(namelen + boolmax))
        return (ERR);
 
          return (ERR);
 
     if (even_boundary(namelen + boolmax))
        return (ERR);
 

-    TRACE_OUT(("Numerics begin at %04lx", ftell(fp)));
+    TRACE_OUT(("Numerics begin at %04x", *offset));

 
     /* the numerics */
 
     /* the numerics */

-    convert_shorts(buf, tp->Numbers, nummax);
-    if (fwrite(buf, 2, nummax, fp) != nummax)
+    convert_numbers(buf, tp->Numbers, nummax);
+    if (Write(buf, 2, nummax) != nummax)

        return (ERR);
 
        return (ERR);
 

-    TRACE_OUT(("String offsets begin at %04lx", ftell(fp)));
+    TRACE_OUT(("String offsets begin at %04x", *offset));

 
     /* the string offsets */
     convert_shorts(buf, offsets, strmax);
 
     /* the string offsets */
     convert_shorts(buf, offsets, strmax);

-    if (fwrite(buf, 2, strmax, fp) != strmax)
+    if (Write(buf, 2, strmax) != strmax)

        return (ERR);
 
        return (ERR);
 

-    TRACE_OUT(("String table begins at %04lx", ftell(fp)));
+    TRACE_OUT(("String table begins at %04x", *offset));

 
     /* the strings */
     for (i = 0; i < strmax; i++)
 
     /* the strings */
     for (i = 0; i < strmax; i++)


@@ -503,15 +747,23 @@ write_object(FILE * fp, TERMTYPE * tp)
                return (ERR);
 
 #if NCURSES_XNAMES
                return (ERR);
 
 #if NCURSES_XNAMES

-    if (NUM_EXT_NAMES(tp)) {
-       unsigned extcnt = NUM_EXT_NAMES(tp);
+    if (extended_object(tp)) {
+       unsigned extcnt = (unsigned) NUM_EXT_NAMES(tp);

 
        if (even_boundary(nextfree))
            return (ERR);
 
 
        if (even_boundary(nextfree))
            return (ERR);
 

-       nextfree = compute_offsets(tp->Strings + STRCOUNT, tp->ext_Strings, offsets);
+       nextfree = compute_offsets(tp->Strings + STRCOUNT,
+                                  (size_t) tp->ext_Strings,
+                                  offsets);

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

-       nextfree += compute_offsets(tp->ext_Names, extcnt, offsets + tp->ext_Strings);
+
+       if (tp->ext_Strings >= SIZEOF(offsets))
+           return (ERR);
+
+       nextfree += compute_offsets(tp->ext_Names,
+                                   (size_t) extcnt,
+                                   offsets + tp->ext_Strings);

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


@@ -523,23 +775,23 @@ write_object(FILE * fp, TERMTYPE * tp)
        LITTLE_ENDIAN(buf + 4, tp->ext_Strings);
        LITTLE_ENDIAN(buf + 6, strmax);
        LITTLE_ENDIAN(buf + 8, nextfree);
        LITTLE_ENDIAN(buf + 4, tp->ext_Strings);
        LITTLE_ENDIAN(buf + 6, strmax);
        LITTLE_ENDIAN(buf + 8, nextfree);

-       TRACE_OUT(("WRITE extended-header @%ld", ftell(fp)));
-       if (fwrite(buf, 10, 1, fp) != 1)
+       TRACE_OUT(("WRITE extended-header @%d", *offset));
+       if (Write(buf, 10, 1) != 1)

            return (ERR);
 
            return (ERR);
 

-       TRACE_OUT(("WRITE %d booleans @%ld", tp->ext_Booleans, ftell(fp)));
+       TRACE_OUT(("WRITE %d booleans @%d", tp->ext_Booleans, *offset));

        if (tp->ext_Booleans
        if (tp->ext_Booleans

-           && fwrite(tp->Booleans + BOOLCOUNT, sizeof(char),
-                     tp->ext_Booleans, fp) != tp->ext_Booleans)
+           && Write(tp->Booleans + BOOLCOUNT, sizeof(char),
+                    tp->ext_Booleans) != tp->ext_Booleans)

              return (ERR);
 
        if (even_boundary(tp->ext_Booleans))
            return (ERR);
 
              return (ERR);
 
        if (even_boundary(tp->ext_Booleans))
            return (ERR);
 

-       TRACE_OUT(("WRITE %d numbers @%ld", tp->ext_Numbers, ftell(fp)));
+       TRACE_OUT(("WRITE %d numbers @%d", tp->ext_Numbers, *offset));

        if (tp->ext_Numbers) {
        if (tp->ext_Numbers) {

-           convert_shorts(buf, tp->Numbers + NUMCOUNT, tp->ext_Numbers);
-           if (fwrite(buf, 2, tp->ext_Numbers, fp) != 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);
        }
 
                return (ERR);
        }
 


@@ -548,8 +800,8 @@ write_object(FILE * fp, TERMTYPE * tp)
         * in that order.
         */
        convert_shorts(buf, offsets, strmax);
         * in that order.
         */
        convert_shorts(buf, offsets, strmax);

-       TRACE_OUT(("WRITE offsets @%ld", ftell(fp)));
-       if (fwrite(buf, 2, strmax, fp) != strmax)
+       TRACE_OUT(("WRITE offsets @%d", *offset));
+       if (Write(buf, 2, strmax) != strmax)

            return (ERR);
 
        /*
            return (ERR);
 
        /*


@@ -558,7 +810,7 @@ write_object(FILE * fp, TERMTYPE * tp)
         */
        for (i = 0; i < tp->ext_Strings; i++) {
            if (VALID_STRING(tp->Strings[i + STRCOUNT])) {
         */
        for (i = 0; i < tp->ext_Strings; i++) {
            if (VALID_STRING(tp->Strings[i + STRCOUNT])) {

-               TRACE_OUT(("WRITE ext_Strings[%d]=%s", i,
+               TRACE_OUT(("WRITE ext_Strings[%d]=%s", (int) i,

                           _nc_visbuf(tp->Strings[i + STRCOUNT])));
                if (!WRITE_STRING(tp->Strings[i + STRCOUNT]))
                    return (ERR);
                           _nc_visbuf(tp->Strings[i + STRCOUNT])));
                if (!WRITE_STRING(tp->Strings[i + STRCOUNT]))
                    return (ERR);


@@ -569,7 +821,7 @@ write_object(FILE * fp, TERMTYPE * tp)
         * Write the extended names
         */
        for (i = 0; i < extcnt; i++) {
         * Write the extended names
         */
        for (i = 0; i < extcnt; i++) {

-           TRACE_OUT(("WRITE ext_Names[%d]=%s", i, tp->ext_Names[i]));
+           TRACE_OUT(("WRITE ext_Names[%d]=%s", (int) i, tp->ext_Names[i]));

            if (!WRITE_STRING(tp->ext_Names[i]))
                return (ERR);
        }
            if (!WRITE_STRING(tp->ext_Names[i]))
                return (ERR);
        }


@@ -578,6 +830,8 @@ write_object(FILE * fp, TERMTYPE * tp)
 #endif /* NCURSES_XNAMES */
 
     total_written++;
 #endif /* NCURSES_XNAMES */
 
     total_written++;

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

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


@@ -587,5 +841,7 @@ write_object(FILE * fp, TERMTYPE * tp)
 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;
 }