ncurses 6.1 - patch 20180526

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

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

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


@@ -43,19 +43,24 @@
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)
 
 #if 1
 #define TRACE_OUT(p) DEBUG(2, p)

+#define TRACE_NUM(n) if (VALID_NUMERIC(Numbers[n])) { \
+       TRACE_OUT(("put Numbers[%u]=%d", (unsigned) (n), Numbers[n])); }

 #else
 #define TRACE_OUT(p)           /*nothing */
 #else
 #define TRACE_OUT(p)           /*nothing */

+#define TRACE_NUM(n)           /* nothing */

 #endif
 
 #endif
 

-MODULE_ID("$Id: write_entry.c,v 1.95 2016/09/10 20:22:42 tom Exp $")
+MODULE_ID("$Id: write_entry.c,v 1.105 2018/05/20 18:38:08 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 *);
 
 #if !USE_HASHED_DB
 static void
 
 static int make_db_root(const char *);
 
 #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);


@@ -246,7 +251,7 @@ _nc_set_writedir(const 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
 


@@ -267,6 +272,9 @@ _nc_write_entry(TERMTYPE *const tp)
 #endif
 #endif /* USE_SYMLINKS */
 
 #endif
 #endif /* USE_SYMLINKS */
 

+    unsigned limit2 = sizeof(filename) - (2 + LEAF_LEN);
+    char saved = '\0';
+

     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 */
 


@@ -342,6 +350,8 @@ _nc_write_entry(TERMTYPE *const tp)
                       sizeof(buffer) - 1);
            data.size = name_size + 1;
 
                       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') {


@@ -356,6 +366,8 @@ _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);
            }
        }


@@ -365,11 +377,19 @@ _nc_write_entry(TERMTYPE *const tp)
        start_time = 0;
     }
 
        start_time = 0;
     }
 

-    if (strlen(first_name) >= sizeof(filename) - (2 + LEAF_LEN))
+    if (strlen(first_name) >= limit2) {

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

+       saved = first_name[limit2];
+       first_name[limit2] = '\0';
+    }

 
     _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))
 
     _nc_SPRINTF(filename, _nc_SLIMIT(sizeof(filename))

-               LEAF_FMT "/%s", first_name[0], first_name);
+               LEAF_FMT "/%.*s", UChar(first_name[0]),
+               (int) (sizeof(filename) - LEAF_LEN - 2),
+               first_name);
+
+    if (saved)
+       first_name[limit2] = saved;

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


@@ -443,7 +463,7 @@ _nc_write_entry(TERMTYPE *const tp)
                _nc_STRNCPY(symlinkname, first_name, MY_SIZE);
            } else {
                _nc_STRCPY(symlinkname, "../", sizeof(symlinkname));
                _nc_STRNCPY(symlinkname, first_name, MY_SIZE);
            } else {
                _nc_STRCPY(symlinkname, "../", sizeof(symlinkname));

-               _nc_STRNCPY(symlinkname + 3, first_name, MY_SIZE - 3);
+               _nc_STRNCPY(symlinkname + 3, filename, MY_SIZE - 3);

            }
            symlinkname[MY_SIZE] = '\0';
 #endif /* USE_SYMLINKS */
            }
            symlinkname[MY_SIZE] = '\0';
 #endif /* USE_SYMLINKS */


@@ -542,7 +562,7 @@ compute_offsets(char **Strings, size_t strmax, short *offsets)
     return nextfree;
 }
 
     return nextfree;
 }
 

-static void
+static size_t

 convert_shorts(unsigned char *buf, short *Numbers, size_t count)
 {
     size_t i;
 convert_shorts(unsigned char *buf, short *Numbers, size_t count)
 {
     size_t i;


@@ -557,14 +577,49 @@ convert_shorts(unsigned char *buf, short *Numbers, size_t count)
            TRACE_OUT(("put Numbers[%u]=%d", (unsigned) i, Numbers[i]));
        }
     }
            TRACE_OUT(("put Numbers[%u]=%d", (unsigned) i, Numbers[i]));
        }
     }

+    return SIZEOF_SHORT;
+}
+
+#if NCURSES_EXT_NUMBERS
+static size_t
+convert_16bit(unsigned char *buf, NCURSES_INT2 *Numbers, size_t count)
+{
+    size_t i, j;
+    size_t size = SIZEOF_SHORT;
+    for (i = 0; i < count; i++) {
+       unsigned value = (unsigned) Numbers[i];
+       TRACE_NUM(i);
+       for (j = 0; j < size; ++j) {
+           *buf++ = value & 0xff;
+           value >>= 8;
+       }
+    }
+    return size;
+}
+
+static size_t
+convert_32bit(unsigned char *buf, NCURSES_INT2 *Numbers, size_t count)
+{
+    size_t i, j;
+    size_t size = SIZEOF_INT2;
+    for (i = 0; i < count; i++) {
+       unsigned value = (unsigned) Numbers[i];
+       TRACE_NUM(i);
+       for (j = 0; j < size; ++j) {
+           *buf++ = value & 0xff;
+           value >>= 8;
+       }
+    }
+    return size;

 }
 }

+#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;


@@ -577,7 +632,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;


@@ -590,7 +645,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;


@@ -607,7 +662,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;
 


@@ -621,10 +676,10 @@ extended_object(TERMTYPE *tp)
 #endif
 
 NCURSES_EXPORT(int)
 #endif
 
 NCURSES_EXPORT(int)

-_nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
+_nc_write_object(TERMTYPE2 *tp, char *buffer, unsigned *offset, unsigned limit)

 {
     char *namelist;
 {
     char *namelist;

-    size_t namelen, boolmax, nummax, strmax;
+    size_t namelen, boolmax, nummax, strmax, numlen;

     char zero = '\0';
     size_t i;
     int nextfree;
     char zero = '\0';
     size_t i;
     int nextfree;


@@ -633,6 +688,12 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
     unsigned last_bool = BOOLWRITE;
     unsigned last_num = NUMWRITE;
     unsigned last_str = STRWRITE;
     unsigned last_bool = BOOLWRITE;
     unsigned last_num = NUMWRITE;
     unsigned last_str = STRWRITE;

+#if NCURSES_EXT_NUMBERS
+    bool need_ints = FALSE;
+    size_t (*convert_numbers) (unsigned char *, NCURSES_INT2 *, size_t) = convert_32bit;
+#else
+#define convert_numbers convert_shorts
+#endif

 
 #if NCURSES_XNAMES
     /*
 
 #if NCURSES_XNAMES
     /*


@@ -653,14 +714,21 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 
     boolmax = 0;
     for (i = 0; i < last_bool; i++) {
 
     boolmax = 0;
     for (i = 0; i < last_bool; i++) {

-       if (tp->Booleans[i] == TRUE)
+       if (tp->Booleans[i] == TRUE) {

            boolmax = i + 1;
            boolmax = i + 1;

+       }

     }
 
     nummax = 0;
     for (i = 0; i < last_num; i++) {
     }
 
     nummax = 0;
     for (i = 0; i < last_num; i++) {

-       if (tp->Numbers[i] != ABSENT_NUMERIC)
+       if (tp->Numbers[i] != ABSENT_NUMERIC) {

            nummax = i + 1;
            nummax = i + 1;

+#if NCURSES_EXT_NUMBERS
+           if (tp->Numbers[i] > MAX_OF_TYPE(NCURSES_COLOR_T)) {
+               need_ints = TRUE;
+           }
+#endif
+       }

     }
 
     strmax = 0;
     }
 
     strmax = 0;


@@ -672,7 +740,17 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
     nextfree = compute_offsets(tp->Strings, strmax, offsets);
 
     /* fill in the header */
     nextfree = compute_offsets(tp->Strings, strmax, offsets);
 
     /* fill in the header */

+#if NCURSES_EXT_NUMBERS
+    if (need_ints) {
+       convert_numbers = convert_32bit;
+       LITTLE_ENDIAN(buf, MAGIC2);
+    } else {
+       convert_numbers = convert_16bit;
+       LITTLE_ENDIAN(buf, MAGIC);
+    }
+#else

     LITTLE_ENDIAN(buf, MAGIC);
     LITTLE_ENDIAN(buf, MAGIC);

+#endif

     LITTLE_ENDIAN(buf + 2, min(namelen, MAX_NAME_SIZE + 1));
     LITTLE_ENDIAN(buf + 4, boolmax);
     LITTLE_ENDIAN(buf + 6, nummax);
     LITTLE_ENDIAN(buf + 2, min(namelen, MAX_NAME_SIZE + 1));
     LITTLE_ENDIAN(buf + 4, boolmax);
     LITTLE_ENDIAN(buf + 6, nummax);


@@ -699,15 +777,15 @@ _nc_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);
-    if (Write(buf, 2, nummax) != nummax)
+    numlen = convert_numbers(buf, tp->Numbers, nummax);
+    if (Write(buf, numlen, nummax) != nummax)

        return (ERR);
 
     TRACE_OUT(("String offsets begin at %04x", *offset));
 
     /* the string offsets */
     convert_shorts(buf, offsets, strmax);
        return (ERR);
 
     TRACE_OUT(("String offsets begin at %04x", *offset));
 
     /* the string offsets */
     convert_shorts(buf, offsets, strmax);

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

        return (ERR);
 
     TRACE_OUT(("String table begins at %04x", *offset));
        return (ERR);
 
     TRACE_OUT(("String table begins at %04x", *offset));


@@ -720,7 +798,8 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 
 #if NCURSES_XNAMES
     if (extended_object(tp)) {
 
 #if NCURSES_XNAMES
     if (extended_object(tp)) {

-       unsigned extcnt = (unsigned) NUM_EXT_NAMES(tp);
+       unsigned ext_total = (unsigned) NUM_EXT_NAMES(tp);
+       unsigned ext_usage = ext_total;

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


@@ -734,10 +813,16 @@ _nc_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,

-                                   (size_t) extcnt,
+                                   (size_t) ext_total,

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

-       strmax = tp->ext_Strings + extcnt;
+       strmax = tp->ext_Strings + ext_total;
+       for (i = 0; i < tp->ext_Strings; ++i) {
+           if (VALID_STRING(tp->Strings[i + STRCOUNT])) {
+               ext_usage++;
+           }
+       }
+       TRACE_OUT(("will write %u/%lu strings", ext_usage, (unsigned long) strmax));

 
        /*
         * Write the extended header
 
        /*
         * Write the extended header


@@ -745,7 +830,7 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
        LITTLE_ENDIAN(buf + 0, tp->ext_Booleans);
        LITTLE_ENDIAN(buf + 2, tp->ext_Numbers);
        LITTLE_ENDIAN(buf + 4, tp->ext_Strings);
        LITTLE_ENDIAN(buf + 0, tp->ext_Booleans);
        LITTLE_ENDIAN(buf + 2, tp->ext_Numbers);
        LITTLE_ENDIAN(buf + 4, tp->ext_Strings);

-       LITTLE_ENDIAN(buf + 6, strmax);
+       LITTLE_ENDIAN(buf + 6, ext_usage);

        LITTLE_ENDIAN(buf + 8, nextfree);
        TRACE_OUT(("WRITE extended-header @%d", *offset));
        if (Write(buf, 10, 1) != 1)
        LITTLE_ENDIAN(buf + 8, nextfree);
        TRACE_OUT(("WRITE extended-header @%d", *offset));
        if (Write(buf, 10, 1) != 1)


@@ -762,8 +847,8 @@ _nc_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, (size_t) tp->ext_Numbers);
-           if (Write(buf, 2, tp->ext_Numbers) != tp->ext_Numbers)
+           numlen = convert_numbers(buf, tp->Numbers + NUMCOUNT, (size_t) tp->ext_Numbers);
+           if (Write(buf, numlen, tp->ext_Numbers) != tp->ext_Numbers)

                return (ERR);
        }
 
                return (ERR);
        }
 


@@ -773,7 +858,7 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
         */
        convert_shorts(buf, offsets, strmax);
        TRACE_OUT(("WRITE offsets @%d", *offset));
         */
        convert_shorts(buf, offsets, strmax);
        TRACE_OUT(("WRITE offsets @%d", *offset));

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

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


@@ -792,7 +877,7 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
        /*
         * Write the extended names
         */
        /*
         * Write the extended names
         */

-       for (i = 0; i < extcnt; i++) {
+       for (i = 0; i < ext_total; i++) {

            TRACE_OUT(("WRITE ext_Names[%d]=%s", (int) i, tp->ext_Names[i]));
            if (!WRITE_STRING(tp->ext_Names[i]))
                return (ERR);
            TRACE_OUT(("WRITE ext_Names[%d]=%s", (int) i, tp->ext_Names[i]));
            if (!WRITE_STRING(tp->ext_Names[i]))
                return (ERR);


@@ -802,6 +887,8 @@ _nc_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);
 }
 


@@ -811,5 +898,7 @@ _nc_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;
 }