ncurses 5.6 - patch 20080621

[ncurses.git] / ncurses / base / lib_freeall.c

diff --git a/ncurses/base/lib_freeall.c b/ncurses/base/lib_freeall.c
index 0fc86239c836970da256bc8cf2029ff831f1287f..b06123d2593fa09288fe93beeea1987dc54ca115 100644 (file)
--- a/ncurses/base/lib_freeall.c
+++ b/ncurses/base/lib_freeall.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2006,2007 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2007,2008 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            *


@@ -40,7 +40,7 @@
 extern int malloc_errfd;       /* FIXME */
 #endif
 
 extern int malloc_errfd;       /* FIXME */
 #endif
 

-MODULE_ID("$Id: lib_freeall.c,v 1.44 2007/06/02 19:40:25 tom Exp $")
+MODULE_ID("$Id: lib_freeall.c,v 1.49 2008/06/21 21:26:33 tom Exp $")

 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical
 
 /*
  * Free all ncurses data.  This is used for testing only (there's no practical


@@ -61,12 +61,16 @@ _nc_freeall(void)
     }
 #endif
     if (SP != 0) {
     }
 #endif
     if (SP != 0) {

+       _nc_lock_global(curses);
+

        while (_nc_windows != 0) {
        while (_nc_windows != 0) {

+           bool deleted = FALSE;
+

            /* Delete only windows that're not a parent */
            /* Delete only windows that're not a parent */

-           for (p = _nc_windows; p != 0; p = p->next) {
+           for (each_window(p)) {

                bool found = FALSE;
 
                bool found = FALSE;
 

-               for (q = _nc_windows; q != 0; q = q->next) {
+               for (each_window(q)) {

                    if ((p != q)
                        && (q->win._flags & _SUBWIN)
                        && (&(p->win) == q->win._parent)) {
                    if ((p != q)
                        && (q->win._flags & _SUBWIN)
                        && (&(p->win) == q->win._parent)) {


@@ -76,28 +80,29 @@ _nc_freeall(void)
                }
 
                if (!found) {
                }
 
                if (!found) {

-                   delwin(&(p->win));
+                   if (delwin(&(p->win)) != ERR)
+                       deleted = TRUE;

                    break;
                }
            }
                    break;
                }
            }

+
+           /*
+            * Don't continue to loop if the list is trashed.
+            */
+           if (!deleted)
+               break;

        }
        delscreen(SP);
        }
        delscreen(SP);

+       _nc_unlock_global(curses);

     }
     if (cur_term != 0)
        del_curterm(cur_term);
 
     }
     if (cur_term != 0)
        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);
 #endif
 
     (void) _nc_printf_string(0, empty_va);
 #ifdef TRACE
     (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
     _nc_leaks_tinfo();
 
 #if HAVE_LIBDBMALLOC