ncurses 5.9 - patch 20110507

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

diff --git a/ncurses/tinfo/entries.c b/ncurses/tinfo/entries.c
index 8b63f0d8965c4de868b47c0bbbea87edcd8f73b0..b1e14a803f313e452c5b314ab91e0610c5418d07 100644 (file)
--- a/ncurses/tinfo/entries.c
+++ b/ncurses/tinfo/entries.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2006,2007 Free Software Foundation, Inc.                   *
+ * Copyright (c) 2006-2009,2010 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            *
@@ -28,6 +28,7 @@
 
 /****************************************************************************
  *  Author: Thomas E. Dickey                                                *
+ *     and: Juergen Pfeifer                                                 *
  ****************************************************************************/
 
 #include <curses.priv.h>
@@ -35,9 +36,8 @@
 #include <ctype.h>
 
 #include <tic.h>
-#include <term_entry.h>
 
-MODULE_ID("$Id: entries.c,v 1.4 2007/11/03 21:00:27 tom Exp $")
+MODULE_ID("$Id: entries.c,v 1.17 2010/01/23 17:57:43 tom Exp $")
 
 /****************************************************************************
  *
@@ -111,26 +111,39 @@ _nc_delink_entry(ENTRY * headp, TERMTYPE *tterm)
 NCURSES_EXPORT(void)
 _nc_leaks_tinfo(void)
 {
+#if NO_LEAKS
     char *s;
+#endif
 
     T((T_CALLED("_nc_free_tinfo()")));
 #if NO_LEAKS
     _nc_free_tparm();
     _nc_tgetent_leaks();
-#endif
+
+    if (TerminalOf(CURRENT_SCREEN) != 0) {
+       del_curterm(TerminalOf(CURRENT_SCREEN));
+    }
+
+    _nc_comp_captab_leaks();
     _nc_free_entries(_nc_head);
     _nc_get_type(0);
     _nc_first_name(0);
-#if NO_LEAKS
     _nc_keyname_leaks();
-#endif
 #if BROKEN_LINKER || USE_REENTRANT
     _nc_names_leaks();
     _nc_codes_leaks();
+    FreeIfNeeded(_nc_prescreen.real_acs_map);
 #endif
 
     if ((s = _nc_home_terminfo()) != 0)
        free(s);
+
+#ifdef TRACE
+    trace(0);
+    _nc_trace_buf(-1, 0);
+#endif
+
+#endif /* NO_LEAKS */
     returnVoid;
 }