X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_freeall.c;h=c4c90300c5f543647a7093c19646eaa91da1c008;hp=324e7a28274150b3de24b3ac6e108fd48e63b644;hb=3ec8f79f3ceda990461c80de2f96d66b886e00d5;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 324e7a28..c4c90300 100644
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2006,2007 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            *
@@ -27,11 +27,12 @@
  ****************************************************************************/
 
 /****************************************************************************
- *  Author: Thomas E. Dickey <dickey@clark.net> 1996,1997                   *
+ *  Author: Thomas E. Dickey                    1996,1997                   *
  ****************************************************************************/
 
 #include <curses.priv.h>
 #include <term_entry.h>
+#include <tic.h>
 
 #if HAVE_NC_FREEALL
 
@@ -39,94 +40,94 @@
 extern int malloc_errfd;	/* FIXME */
 #endif
 
-MODULE_ID("$Id: lib_freeall.c,v 1.15 1999/10/22 21:40:10 tom Exp $")
-
-static void free_slk(SLK *p)
-{
-	if (p != 0) {
-		FreeIfNeeded(p->ent);
-		FreeIfNeeded(p->buffer);
-		free(p);
-	}
-}
-
-static void free_tries(struct tries *p)
-{
-	struct tries *q;
-
-	while (p != 0) {
-		q = p->sibling;
-		if (p->child != 0)
-			free_tries(p->child);
-		free(p);
-		p = q;
-	}
-}
+MODULE_ID("$Id: lib_freeall.c,v 1.43 2007/05/05 20:56:17 tom Exp $")
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
  * use for it as an extension).
  */
-void _nc_freeall(void)
+NCURSES_EXPORT(void)
+_nc_freeall(void)
 {
-	WINDOWLIST *p, *q;
+    WINDOWLIST *p, *q;
+    static va_list empty_va;
 
+    T((T_CALLED("_nc_freeall()")));
 #if NO_LEAKS
-	_nc_free_tparm();
+    if (SP != 0) {
+	if (SP->_oldnum_list != 0) {
+	    FreeAndNull(SP->_oldnum_list);
+	}
+    }
 #endif
+    if (SP != 0) {
 	while (_nc_windows != 0) {
-		/* Delete only windows that're not a parent */
-		for (p = _nc_windows; p != 0; p = p->next) {
-			bool found = FALSE;
-
-			for (q = _nc_windows; q != 0; q = q->next) {
-				if ((p != q)
-				 && (q->win->_flags & _SUBWIN)
-				 && (p->win == q->win->_parent)) {
-					found = TRUE;
-					break;
-				}
-			}
-
-			if (!found) {
-				delwin(p->win);
-				break;
-			}
+	    /* Delete only windows that're not a parent */
+	    for (p = _nc_windows; p != 0; p = p->next) {
+		bool found = FALSE;
+
+		for (q = _nc_windows; q != 0; q = q->next) {
+		    if ((p != q)
+			&& (q->win._flags & _SUBWIN)
+			&& (&(p->win) == q->win._parent)) {
+			found = TRUE;
+			break;
+		    }
 		}
-	}
-
-	if (SP != 0) {
-		free_tries (SP->_keytry);
-		free_tries (SP->_key_ok);
-	    	free_slk(SP->_slk);
-		FreeIfNeeded(SP->_color_pairs);
-		FreeIfNeeded(SP->_color_table);
-#if !BROKEN_LINKER
-		FreeAndNull(SP);
-#endif
-	}
 
-	if (cur_term != 0) {
-		_nc_free_termtype(&(cur_term->type));
-		free(cur_term);
+		if (!found) {
+		    delwin(&(p->win));
+		    break;
+		}
+	    }
 	}
+	delscreen(SP);
+    }
+    del_curterm(cur_term);
 
+#if USE_WIDEC_SUPPORT
+    FreeIfNeeded(_nc_wacs);
+#endif
+    (void) _nc_printf_string(0, empty_va);
 #ifdef TRACE
-	(void) _nc_trace_buf(-1, 0);
+    (void) _nc_trace_buf(-1, 0);
+#endif
+
+#if BROKEN_LINKER || USE_REENTRANT
+    FreeIfNeeded(_nc_prescreen.real_acs_map);
 #endif
+
+    _nc_leaks_tinfo();
+
 #if HAVE_LIBDBMALLOC
-	malloc_dump(malloc_errfd);
+    malloc_dump(malloc_errfd);
 #elif HAVE_LIBDMALLOC
+#elif HAVE_LIBMPATROL
+    __mp_summary();
 #elif HAVE_PURIFY
-	purify_all_inuse();
+    purify_all_inuse();
 #endif
+    returnVoid;
 }
 
-void _nc_free_and_exit(int code)
+NCURSES_EXPORT(void)
+_nc_free_and_exit(int code)
 {
-	_nc_freeall();
-	exit(code);
+    char *last_setbuf = (SP != 0) ? SP->_setbuf : 0;
+
+    _nc_freeall();
+#ifdef TRACE
+    trace(0);			/* close trace file, freeing its setbuf */
+    free(_nc_varargs("?", 0));
+#endif
+    fclose(stdout);
+    FreeIfNeeded(last_setbuf);
+    exit(code);
 }
+
 #else
-void _nc_freeall(void) { }
+NCURSES_EXPORT(void)
+_nc_freeall(void)
+{
+}
 #endif