ncurses 6.0 - patch 20170401

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

diff --git a/ncurses/tinfo/write_entry.c b/ncurses/tinfo/write_entry.c
index b76a109d67a664472dad6845fd5d8084741c5e7c..8a49a2c0d7f4b005f740f0a03b456a72ddd7631d 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-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            *
@@ -47,9 +47,11 @@
 #define TRACE_OUT(p)           /*nothing */
 #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.98 2017/02/05 01:47:34 tom Exp $")
 
 static int total_written;
+static int total_parts;
+static int total_size;
 
 static int make_db_root(const char *);
 
@@ -342,6 +344,8 @@ _nc_write_entry(TERMTYPE *const tp)
                       sizeof(buffer) - 1);
            data.size = name_size + 1;
 
+           total_size += data.size;
+           total_parts++;
            _nc_db_put(capdb, &key, &data);
 
            while (*other_names != '\0') {
@@ -356,6 +360,8 @@ _nc_write_entry(TERMTYPE *const tp)
                key.data = ptr;
                key.size = strlen(ptr);
 
+               total_size += data.size;
+               total_parts++;
                _nc_db_put(capdb, &key, &data);
            }
        }
@@ -443,7 +449,7 @@ _nc_write_entry(TERMTYPE *const tp)
                _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 */
@@ -802,6 +808,8 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 #endif /* NCURSES_XNAMES */
 
     total_written++;
+    total_parts++;
+    total_size = total_size + (int) (*offset + 1);
     return (OK);
 }
 
@@ -811,5 +819,7 @@ _nc_write_object(TERMTYPE *tp, char *buffer, unsigned *offset, unsigned limit)
 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;
 }